fix: corrected small errors on caching

Author: drgroot

.github/workflows/pypi.yml

@@ -1,18 +1,40 @@
 name: 'Package Publish'
 on: 
-  - push
+  push:
+  pull_request:
 
 jobs: 
   packagepublish:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://git.yusufali.ca/actions/commit@main
-
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: true
-          fetch-depth: 0
+          fetch-depth: 100
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+
+      - name: Install lint
+        shell: bash
+        run: |
+          npm install -g @commitlint/cli @commitlint/config-conventional
+          if [ ! -f "commitlint.config.js" ]; then
+            echo "module.exports = {extends: ['@commitlint/config-conventional']}" > commitlint.config.js
+          fi        
+
+      - name: Lint Commit Message
+        if: github.event_name == 'push'
+        shell: bash
+        run: commitlint --from=HEAD~2 --verbose || true
+
+      - name: Lint Pull Request
+        if: github.event_name == 'pull_request'
+        shell: bash
+        run: commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
 
       - uses: actions/setup-python@v5
         with:

.github/workflows/servc.yml

@@ -13,6 +13,12 @@ jobs:
       matrix:
         python-version: 
           - 3.13
+        test:
+          - service/test_config
+          - service/test_h
+          - service/test_p
+          - service/test_simple_metho
+          - config/
 
     services:
       rabbitmq:
@@ -53,13 +59,12 @@ jobs:
       - name: Set Environment Variables
         run: |
           echo "CURRENT_PATH=$(pwd)" >> $GITHUB_ENV
-          chmod +x start.sh
 
       - name: Checkout Serv-C
         uses: actions/checkout@v4
         with:
           repository: serv-c/docs
-          ref: 0.3.2
+          ref: 0.3.3
           path: servc-docs
           sparse-checkout: |
             tests
@@ -75,7 +80,7 @@ jobs:
         shell: bash
         working-directory: servc-docs
         env:
-          START_SCRIPT: ${{ env.CURRENT_PATH }}/start.sh
+          START_SCRIPT: ${{ env.CURRENT_PATH }}/main.py
           CACHE_URL: redis://redis
           BUS_URL: amqp://guest:guest@rabbitmq
-        run: python -m unittest tests/**/*.py
+        run: python -m unittest tests/${{ matrix.test }}*.py

README.md

@@ -12,7 +12,7 @@ Here is the most simple example of use, starting a server to handle requests at
 ```python
 from servc.server import start_server
 
-def inputProcessor(messageId, bus, cache, payload, components):
+def inputProcessor(messageId, bus, cache, payload, components, emitEvent):
   pass
 
 # the method 'methodA' will be resolved by inputProcessor

main.py

@@ -1,19 +1,52 @@
+#!/usr/bin/env python
+
+import os
+
 from servc.server import start_server
+from servc.svc.client.send import sendMessage
+from servc.svc.idgen.simple import simple
+from servc.svc.io.input import InputType
 
 
-def test_resolver(id, bus, cache, payload, _c):
+def test_resolver(id, bus, cache, payload: str | list[str], _c, emitEvent):
     if not isinstance(payload, list):
+        sendMessage(
+            {
+                "type": InputType.INPUT.value,
+                "id": "",
+                "route": os.getenv("SEND_ROUTE", "my-response-queue"),
+                "force": True,
+                "argumentId": "",
+                "argument": {
+                    "method": "test",
+                    "inputs": payload,
+                },
+            },
+            bus,
+            cache,
+            simple,
+        )
         return False
     for x in payload:
         if not isinstance(x, str):
             return False
+
+    emitEvent(
+        os.getenv("EVENT", "my-event"),
+        payload,
+    )
     return True
 
 
+def fail(id, _b, _c, _p, _ch, _e):
+    raise Exception("This is a test exception")
+
+
 def main():
     return start_server(
         resolver={
             "test": test_resolver,
+            "fail": fail,
         },
         # route="test",
     )

servc/server.py

@@ -89,6 +89,7 @@ def start_server(
             onConsuming,
             components,
         ),
+        daemon=True,
     )
     consumer.start()
 

servc/svc/client/send.py

@@ -27,10 +27,9 @@ def sendMessage(
         if "id" not in message or message["id"] in ["", None]
         else message["id"]
     )
-    response = cache.getKey(id)
-
-    if force:
+    if force or message.get("force", False):
         cache.deleteKey(id)
+    response = cache.getKey(id)
 
     if (
         response

servc/svc/com/bus/rabbitmq.py

@@ -7,8 +7,8 @@
 import pika.channel  # type: ignore
 import pika.exceptions  # type: ignore
 import simplejson
-from pika.adapters.blocking_connection import BlockingConnection  # type: ignore
 from pika.adapters.asyncio_connection import AsyncioConnection  # type: ignore
+from pika.adapters.blocking_connection import BlockingConnection  # type: ignore
 
 from servc.svc.com.bus import BusComponent, InputProcessor, OnConsuming
 from servc.svc.com.cache.redis import decimal_default
@@ -40,13 +40,12 @@ class BusRabbitMQ(BusComponent):
     @property
     def isReady(self) -> bool:
         return (
-            self._conn is not None and self._conn.is_open and (
-                self.isBlockingConnection() or
-                not self._conn.is_closing
-            )
+            self._conn is not None
+            and self._conn.is_open
+            and (self.isBlockingConnection() or not self._conn.is_closing)
         )
 
-    @ property
+    @property
     def isOpen(self) -> bool:
         return self.isReady
 
@@ -67,9 +66,10 @@ def _connect(self, method=None | Callable, args=None | Tuple, blocking=True):
 
     def _close(self):
         if self.isOpen or self.isReady:
-            if self._conn and not self._conn.is_closed and (
-                self.isBlockingConnection() or
-                not self._conn.is_closing
+            if (
+                self._conn
+                and not self._conn.is_closed
+                and (self.isBlockingConnection() or not self._conn.is_closing)
             ):
                 self._conn.close()
                 self._conn = None
@@ -117,8 +117,7 @@ def publishMessage(  # type: ignore
             exchange=exchangeName,
             routing_key=self.getRoute(route),
             properties=None,
-            body=simplejson.dumps(
-                message, default=decimal_default, ignore_nan=True),
+            body=simplejson.dumps(message, default=decimal_default, ignore_nan=True),
         )
         channel.close()
 
@@ -135,18 +134,16 @@ def subscribe(  # type: ignore
         if not self.isReady:
             self._connect(
                 self.subscribe,
-                (route, inputProcessor,
-                 onConsuming, bindEventExchange),
-                blocking=False
+                (route, inputProcessor, onConsuming, bindEventExchange),
+                blocking=False,
             )
             self._conn.ioloop.run_forever()  # type: ignore
         elif self.isBlockingConnection():
             self.close()
             return self.subscribe(route, inputProcessor, onConsuming, bindEventExchange)
         if not channel:
             return self.get_channel(
-                self.subscribe, (route, inputProcessor,
-                                 onConsuming, bindEventExchange)
+                self.subscribe, (route, inputProcessor, onConsuming, bindEventExchange)
             )
         channel.add_on_close_callback(lambda _c, _r: self.close())
         channel.add_on_cancel_callback(lambda _c: self.close())

servc/svc/com/cache/redis.py

@@ -45,8 +45,7 @@ def setKey(self, id: str, value: Any) -> str:
             self.connect()
             return self.setKey(id, value)
         self._redisClient.set(
-            id, simplejson.dumps(
-                value, default=decimal_default, ignore_nan=True)
+            id, simplejson.dumps(value, default=decimal_default, ignore_nan=True)
         )
         return id
 

servc/svc/com/http/__init__.py

@@ -141,8 +141,7 @@ def _postMessage(self):
                     body["instanceId"] if "instanceId" in body else self._instanceId
                 )
 
-                id = self._bus.emitEvent(
-                    body["event"], instanceId, body["details"])
+                id = self._bus.emitEvent(body["event"], instanceId, body["details"])
                 return id
             elif body["type"] == InputType.INPUT.value:
                 must_have_keys = ("route", "argument")
@@ -156,6 +155,8 @@ def _postMessage(self):
                     "id": body["id"] if "id" in body else "",
                     "argument": body["argument"],
                 }
+                if "instanceId" in body:
+                    payload["instanceId"] = body["instanceId"]
 
                 id = sendMessage(
                     payload,
@@ -175,12 +176,9 @@ def _getInformation(self):
         return jsonify(self._info)
 
     def bindRoutes(self):
-        self._server.add_url_rule(
-            "/healthz", "healthz", self._health, methods=["GET"])
-        self._server.add_url_rule(
-            "/readyz", "readyz", self._health, methods=["GET"])
+        self._server.add_url_rule("/healthz", "healthz", self._health, methods=["GET"])
+        self._server.add_url_rule("/readyz", "readyz", self._health, methods=["GET"])
         self._server.add_url_rule(
             "/id/<id>", "_getResponse", self._getResponse, methods=["GET"]
         )
-        self._server.add_url_rule(
-            "/", "", self._postMessage, methods=["POST", "GET"])
+        self._server.add_url_rule("/", "", self._postMessage, methods=["POST", "GET"])

servc/svc/com/worker/__init__.py

@@ -1,17 +1,19 @@
 from typing import Any, Callable, Dict, List, Union
 
 from servc.svc import ComponentType, Middleware
+from servc.svc.client.send import sendMessage
 from servc.svc.com.bus import BusComponent, OnConsuming
 from servc.svc.com.cache import CacheComponent
 from servc.svc.config import Config
-from servc.svc.io.input import EventPayload, InputPayload, InputType, ArgumentArtifact
+from servc.svc.idgen.simple import simple as idGenerator
+from servc.svc.io.input import ArgumentArtifact, InputPayload, InputType
 from servc.svc.io.output import StatusCode
 from servc.svc.io.response import getAnswerArtifact, getErrorArtifact
-from servc.svc.client.send import sendMessage
-from servc.svc.idgen.simple import simple as idGenerator
+
+EMIT_EVENT = Callable[[str, Any], None]
 
 RESOLVER = Callable[
-    [str, BusComponent, CacheComponent, Any, List[Middleware]],
+    [str, BusComponent, CacheComponent, Any, List[Middleware], EMIT_EVENT],
     Union[StatusCode, Any, None],
 ]
 
@@ -111,18 +113,12 @@ def connect(self):
             bindEventExchange=self._bindToEventExchange,
         )
 
-    def emitEvent(self, eventName: str, details: Any):
-        eventMessage: EventPayload = {
-            "type": InputType.EVENT.value,
-            "event": eventName,
-            "details": details,
-            "route": self._route,
-            "instanceId": self._instanceId,
-        }
-
-        self._bus.publishMessage(self._route, eventMessage)
+    def emitEvent(self, bus: BusComponent, eventName: str, details: Any):
+        bus.emitEvent(eventName, self._instanceId, details)
 
-    def processPostHooks(self, bus: BusComponent, message: InputPayload, artifact: ArgumentArtifact):
+    def processPostHooks(
+        self, bus: BusComponent, message: InputPayload, artifact: ArgumentArtifact
+    ):
         # print(artifact)
         if "hooks" in artifact and "on_complete" in artifact["hooks"]:
             for hook in artifact["hooks"]["on_complete"]:
@@ -139,9 +135,9 @@ def processPostHooks(self, bus: BusComponent, message: InputPayload, artifact: A
                                 "inputs": {
                                     "id": message["id"],
                                     "method": artifact["method"],
-                                    "inputs": artifact["inputs"]
+                                    "inputs": artifact["inputs"],
                                 },
-                            }
+                            },
                         }
                         sendMessage(payload, bus, self._cache, idGenerator)
                     except Exception as e:
@@ -155,6 +151,7 @@ def inputProcessor(self, message: Any) -> StatusCode:
             self._config.get("conf.bus.prefix"),
         )
         cache = self._cache
+        emitEvent: EMIT_EVENT = lambda x, y: self.emitEvent(bus, x, y)
 
         if "type" not in message or "route" not in message:
             return StatusCode.INVALID_INPUTS
@@ -174,6 +171,7 @@ def inputProcessor(self, message: Any) -> StatusCode:
                 cache,
                 {**message},
                 self._children,
+                emitEvent,
             )
             return StatusCode.OK
 
@@ -223,16 +221,15 @@ def inputProcessor(self, message: Any) -> StatusCode:
                     cache,
                     artifact["inputs"],
                     self._children,
+                    emitEvent,
                 )
-                cache.setKey(message["id"], getAnswerArtifact(
-                    message["id"], response))
+                cache.setKey(message["id"], getAnswerArtifact(message["id"], response))
                 self.processPostHooks(bus, message, artifact)
                 return StatusCode.OK
             except Exception as e:
                 cache.setKey(
                     message["id"],
-                    getErrorArtifact(message["id"], str(
-                        e), StatusCode.SERVER_ERROR),
+                    getErrorArtifact(message["id"], str(e), StatusCode.SERVER_ERROR),
                 )
                 self.processPostHooks(bus, message, artifact)
                 return StatusCode.SERVER_ERROR