v2.1.0 - user can change swagger run port

ProdByGodfather · Jul 21, 2024 · b9a958b · b9a958b
1 parent d4e1d9f
commit b9a958b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/py2proto/__pycache__/__init__.cpython-310.pyc b/py2proto/__pycache__/__init__.cpython-310.pyc
diff --git a/py2proto/__pycache__/main.cpython-310.pyc b/py2proto/__pycache__/main.cpython-310.pyc
diff --git a/py2proto/main.py b/py2proto/main.py
@@ -124,7 +124,7 @@ def generate_pb2(cls, proto_file: str):
             print(f"An error occurred: {e}")
 
     @classmethod
-    def generate_swagger(cls, proto_file, version="1.0.0"):
+    def generate_swagger(cls, proto_file):
         swagger_file = os.path.join(cls.output_directory, "swagger.json")
         protoc.main((
             '',
@@ -140,7 +140,7 @@ def generate_swagger(cls, proto_file, version="1.0.0"):
 
         swagger = {
             "swagger": "2.0",
-            "info": {"title": module_name, "version": version},
+            "info": {"title": module_name, "version": "1.0.0"},
             "schemes": ["http"],
             "consumes": ["application/json"],
             "produces": ["application/json"],
@@ -187,7 +187,7 @@ def descriptor_to_json(descriptor):
                                 "name": field.name,
                                 "type": type_mapping.get(field.type, "string"),
                                 "required": False,
-                                "description": f"Field {field.name} (type: {type_mapping.get(field.type, 'string')})"
+                                "description": f"Field {field.name}"
                             } for field in method.input_type.fields
                         ],
                         "responses": {
@@ -205,7 +205,7 @@ def descriptor_to_json(descriptor):
         return swagger_file
 
     @classmethod
-    def run_swagger(cls, version="2.0.0"):
+    def run_swagger(cls, version="2.0.0", port=5937):
         swagger_file = os.path.join(cls.output_directory, "swagger.json")
 
         from flask import Flask, request, jsonify, send_file, abort
@@ -305,7 +305,8 @@ def grpc_request(service, method):
                 print(f"Error processing gRPC request: {e}")
                 return jsonify({"error": str(e)}), 500
 
-        app.run(debug=True)
+        print(f"Starting Swagger UI on port {port}")
+        app.run(debug=True, port=port)
 
 def relation(request: str, response: str):
-    return ("MessageService", request, response)
+    return ("MessageService", request, response)
diff --git a/sample.py b/sample.py
@@ -18,8 +18,8 @@ class MessageResponse(ProtoGenerator):
     proto_file = MessageProto.generate_proto("messageservice", "message_service")
     # generate_pb2(`proto file`)
     MessageProto.generate_pb2(proto_file)
-    # generate_wsagger(`proto file`, `version name`)
-    swagger_file = MessageProto.generate_swagger(proto_file, "2.0.0")
-    # run swagger with Flask
-    MessageProto.run_swagger()
+    # generate_wsagger(`proto file`)
+    swagger_file = MessageProto.generate_swagger(proto_file)
+    # run_swagger(`version`, `port`)
+    MessageProto.run_swagger(version="2.0.1", port=5937)