Merge pull request #2 from lalithkota/develop

Fixed run_server method call. Fixed openapi push

Author: lalithkota

.github/workflows/openapi-push.yml

@@ -8,6 +8,10 @@ jobs:
   openapi-publish:
     name: OpenAPI Generate and Publish
     runs-on: ubuntu-latest
+    env:
+      BRANCH_NAME: ''
+      OPENAPI_CHANGED: false
+      STOPLIGHT_PROJECT_TOKEN: ${{ secrets.STOPLIGHT_PROJECT_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - name: Get branch name (merge)
@@ -41,10 +45,10 @@ jobs:
           add: "api-docs/generated/openapi.json"
       - name: Setup nodejs
         uses: actions/setup-node@v4
-        if: env.OPENAPI_CHANGED == 'true'
+        if: env.STOPLIGHT_PROJECT_TOKEN != '' && env.OPENAPI_CHANGED == 'true'
         with:
           node-version: '18'
       - name: Publish to stoplight
-        if: env.OPENAPI_CHANGED == 'true'
+        if: env.STOPLIGHT_PROJECT_TOKEN != '' && env.OPENAPI_CHANGED == 'true'
         run: |
-          npx @stoplight/cli@5 push --ci-token ${{ secrets.STOPLIGHT_PROJECT_TOKEN }} --url https://openg2p.stoplight.io --branch ${{ env.BRANCH_NAME }} --directory api-docs/generated
+          npx @stoplight/cli@5 push --ci-token ${{ env.STOPLIGHT_PROJECT_TOKEN }} --url https://openg2p.stoplight.io --branch ${{ env.BRANCH_NAME }} --directory api-docs/generated

src/openg2p_websub_print_listener/app.py

@@ -2,7 +2,7 @@
 
 from .config import Settings
 
-_config = Settings.get_config()
+_config: Settings = Settings.get_config()
 
 from openg2p_fastapi_common.app import Initializer
 
@@ -27,3 +27,7 @@ def init_app(self):
         app = super().init_app()
         app.router.redirect_slashes = False
         return app
+
+    def run_server(self, args):
+        _config._server_running = True
+        return super().run_server(args)

src/openg2p_websub_print_listener/config.py

@@ -17,6 +17,9 @@ class Settings(Settings):
     """
     openapi_version: str = __version__
 
+    # Internal Variable
+    _server_running: bool = False
+
     websub_hub_url: str = "http://localhost:9191/hub"
     websub_subscribe_lease_seconds: int | None = None
     websub_partner_id: str = ""

src/openg2p_websub_print_listener/services/file_store.py

@@ -16,7 +16,8 @@ class FileStoreService(BaseService):
     def __init__(self, **kw):
         super().__init__(**kw)
         self.aws_session = aioboto3.Session()
-        asyncio.run(self.get_or_create_bucket(_config.s3_bucket_name))
+        if _config._server_running:
+            asyncio.run(self.get_or_create_bucket(_config.s3_bucket_name))
 
     async def save_file(self, name, data: bytes, mimetype=None, **kw):
         file_io = io.BytesIO()

src/openg2p_websub_print_listener/services/template_renderer.py

@@ -28,7 +28,8 @@ def __init__(self, **kwargs):
 
         self._unsafe_eval = None
 
-        self.check_if_templates_exist()
+        if _config._server_running:
+            self.check_if_templates_exist()
 
     def get_unsafe_eval(self):
         if not self._unsafe_eval:

tests/test_init.py

@@ -1,3 +1,5 @@
 from openg2p_websub_print_listener.app import Initializer as WebSubPrintListenerApp
 
-WebSubPrintListenerApp()
+
+def test_init():
+    WebSubPrintListenerApp()