Merge remote-tracking branch 'origin/main' into feature/servc

Author: drgroot

.github/workflows/servc.yml

@@ -6,6 +6,73 @@ jobs:
   servc:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: 
+          - 3.13
+
+    services:
+      rabbitmq:
+        image: rabbitmq:3
+        env:
+          RABBITMQ_DEFAULT_USER: guest
+          RABBITMQ_DEFAULT_PASS: guest
+        ports:
+          - 5672/tcp
+
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379/tcp
+
     steps:
-      - name: Run Servc Tests
-        uses: serv-c/docs@0.2.12
+      - if: github.server_url != 'https://github.com'
+        run: sleep 20s
+
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+
+      - 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: main
+          path: servc-docs
+          sparse-checkout: |
+            tests
+            requirements.test.txt
+            config/.placeholder
+
+      - name: Install Serv-C Dependencies
+        run: pip install -r requirements.test.txt
+        shell: bash
+        working-directory: servc-docs
+
+      - name: Run Serv-C tests
+        shell: bash
+        working-directory: servc-docs
+        env:
+          START_SCRIPT: ${{ env.CURRENT_PATH }}/start.sh
+          CACHE_URL: redis://redis
+          BUS_URL: amqp://guest:guest@rabbitmq
+        run: python -m unittest tests/**/*.py

.github/workflows/test.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Type check
         run: |
           pip install mypy
-          pip install types-PyYAML types-simplejson
+          pip install types-PyYAML types-simplejson types-redis
           mypy servc
 
       - name: Install dependencies

requirements.txt

@@ -1,6 +1,6 @@
 -i https://pypi.org/simple
 pika==1.3.2
-redis==5.0.1
+redis==5.2.0
 simplejson==3.19.2
 flask==3.0.1
 pyyaml==6.0.2

servc/svc/com/http/__init__.py

@@ -2,7 +2,7 @@
 from multiprocessing import Process
 from typing import Dict, Tuple, TypedDict
 
-from flask import Flask, jsonify, request
+from flask import Flask, jsonify, request  # type: ignore
 
 from servc.svc import ComponentType, Middleware
 from servc.svc.client.send import sendMessage

servc/svc/com/worker/__init__.py

@@ -44,6 +44,8 @@ class WorkerComponent(Middleware):
 
     _config: Config
 
+    _bindToEventExchange: bool
+
     def __init__(
         self,
         route: str,
@@ -65,6 +67,11 @@ def __init__(
         self._bus = bus
         self._cache = cache
         self._config = config
+        self._bindToEventExchange = (
+            config.get("conf.bus.bindtoeventexchange")
+            if len(self._eventResolvers.keys()) > 0
+            else False
+        )
 
         self._resolvers["healthz"] = lambda *args: HEALTHZ(*args)
 
@@ -84,10 +91,18 @@ def _close(self):
     def connect(self):
         super().connect()
 
+        print("Consumer now Subscribing", flush=True)
+        print(" Route:", self._route, flush=True)
+        print(" InstanceId:", self._instanceId, flush=True)
+        print(" Resolvers:", self._resolvers.keys(), flush=True)
+        print(" Event Resolvers:", self._eventResolvers.keys(), flush=True)
+        print(" Bind to Event Exchange:", self._bindToEventExchange, flush=True)
+
         self._bus.subscribe(
             self._route,
             self.inputProcessor,
             self._onConsuming,
+            bindEventExchange=self._bindToEventExchange,
         )
 
     def emitEvent(self, eventName: str, details: Any):
@@ -173,14 +188,12 @@ def inputProcessor(self, message: Any) -> StatusCode:
                     artifact["inputs"],
                     self._children,
                 )
-                cache.setKey(message["id"], getAnswerArtifact(
-                    message["id"], response))
+                cache.setKey(message["id"], getAnswerArtifact(message["id"], response))
                 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),
                 )
                 return StatusCode.SERVER_ERROR
 

servc/svc/config/__init__.py

@@ -19,6 +19,7 @@
         os.getenv("CONF__BUS__ROUTEMAP", json.dumps({}))
     ),
     "conf.bus.prefix": "",
+    "conf.bus.bindtoeventexchange": True,
 }
 
 

start.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+folder=$(dirname $START_SCRIPT)
+python $folder/main.py