restructured, fixed #7, #1, #9

harmoney/client/__init__.py

@@ -0,0 +1,3 @@
+from .client import Client
+
+__all__ = ["Client"]

harmoney/client/client.py

@@ -1,44 +1,60 @@
 import asyncio
-from ._callSpec import _CallPacket
 import pickle as pkl
+
 from websockets.asyncio import client as WSC
 
+from .._callSpec import _CallPacket
+
 __all__ = ["Client"]
 
+
 class Client:
-    def __init__(self, host, port) -> None:
+    def __init__(self, host: str, port: str | int) -> None:
         self._wsURL = f"ws://{host}:{port}/cliReq/"
         self.tasks = []
 
-    def singleCall(self, function, **kwargs):
+    def singleCall(self, function: str, **kwargs):
         """
         Performs single call with the provided function and args
         """
-        self.addCall(_CallPacket(procedure=function, data=kwargs))
+        self.addCall(function, **kwargs)
         return self.runAllCalls()[0]
 
-    def addCall(self, function, **kwargs):
+    def addCall(self, function: str, **kwargs) -> int:
         """
         Adds a task to call queue.
+        Returns current length of call queue.
         """
         self.tasks.append((_CallPacket(procedure=function, data=kwargs)))
+        return len(self.tasks)
 
-    async def _runAllCalls(self, callDelay=0.01):
+    async def _runAllCalls(self) -> list:
         """
         Logic function to communicate with the router.
         """
-        print(f"Total Calls: {len(self.tasks)}")
+        if len(self.tasks) == 0:
-        async with WSC.connect(self._wsURL+f"{len(self.tasks)}", open_timeout=None, ping_interval=10, ping_timeout=None) as ws:
+            return []
+        print(f"Running {len(self.tasks)} functions")
+        async with WSC.connect(
+            self._wsURL + f"{len(self.tasks)}",
+            open_timeout=None,
+            ping_interval=10,
+            ping_timeout=None,
+        ) as ws:
             ackCount = int(await ws.recv())
             assert ackCount == len(self.tasks), "Comms not proper..."
             await ws.send(pkl.dumps(self.tasks))
             returnData = await ws.recv()
             returnData = pkl.loads(returnData)
-            self.tasks=[]
+            self.tasks.clear()
             return returnData
 
-    def runAllCalls(self, callDelay=0.01):
+    def runAllCalls(self):
         """
         User facing function to remotely execute queued tasks.
         """
-        return asyncio.run(self._runAllCalls(callDelay=callDelay))
+        return asyncio.run(self._runAllCalls())
+
+    def clearQueue(self) -> bool:
+        self.tasks.clear()
+        return True

harmoney/router/__init__.py

@@ -0,0 +1,3 @@
+from .router import startRouter
+
+__all__ = ["startRouter"]

harmoney/router/router.py

@@ -1,18 +1,20 @@
 import asyncio
 import base64
-from threading import Thread
-from typing import List
-from uvicorn import Config, Server
-import fastapi
-from uvicorn.config import LOG_LEVELS
 import pickle as pkl
 import uuid
-from ._callSpec import  _ClientPacket, _CallPacket
+from threading import Thread
+
+import fastapi
+from uvicorn import Config, Server
+from uvicorn.config import LOG_LEVELS
+
+from .._callSpec import _ClientPacket
 
 __all__ = ["startRouter"]
 
+
 class _Router:
-    def __init__(self, pollingDelay=0.5) -> None:
+    def __init__(self, pollingDelay: float | int = 0.5) -> None:
         self.router = fastapi.APIRouter()
         self.router.add_api_websocket_route("/reg", self.registerRunner)
         self.router.add_api_websocket_route("/cliReq/{count}", self.multiClientRequest)
@@ -30,11 +32,14 @@ class _Router:
         await wsConnection.send_text(str(self.runnerCount))
         methods = await wsConnection.receive()
         methods = pkl.loads(base64.b64decode(methods["text"]))
-        print(f"Runner Connected with ID: {self.runnerCount}, Methods: {methods['methods']}")
+        print(
+            f"Runner Connected with ID: {self.runnerCount}, Methods: {methods['methods']}"
+        )
         runnerID = self.runnerCount
         self.runnerCount += 1
         runnerCounter = 0
         while True:
+            # try except here, if connection cuts out, catch and add the task back into the task queue. have a var addBackOnError to decide if crashed task must be added back into the pool. add this id back into available id pools using a shared list.
             reqID, data = await self.taskQueue.get()
             runnerCounter += 1
             print(f"Runr {runnerID} Counter: {runnerCounter}")
@@ -52,8 +57,7 @@ class _Router:
         await self.taskQueue.put((reqID, callPacket))
         while reqID not in self.returnDict:
             await asyncio.sleep(self.pollingDelay)
-        returnValue = self.returnDict[reqID]
+        returnValue = self.returnDict.pop(reqID)
-        self.returnDict.pop(reqID)
         return returnValue
 
     async def multiClientRequest(self, wsConn: fastapi.WebSocket, count: int):
@@ -67,12 +71,14 @@ class _Router:
         reqID = uuid.uuid4().hex
         self.returnDict[reqID] = [0] * count
         self.doneDict[reqID] = [0] * count
-        print(f"Received {count} tasks")
+        # print(f"Received {count} tasks")
         taskBytes = await wsConn.receive_bytes()
         taskPackets = pkl.loads(taskBytes)
         softLimitItr = 0
         for task in range(len(taskPackets)):
-            while (task > (softLimitItr+softLimit)) and not self.doneDict[reqID][softLimitItr]==1:
+            while (task > (softLimitItr + softLimit)) and not self.doneDict[reqID][
+                softLimitItr
+            ] == 1:
                 await asyncio.sleep(1)
             if self.doneDict[reqID][softLimitItr] == 1:
                 softLimitItr += 1
@@ -94,7 +100,10 @@ class _Router:
         self.doneDict[id][idx] = 1
         return
 
-def startRouter(host, port, pollingDelay=0.1, logLevel=3):
+
+def startRouter(
+    host: str, port: str | int, pollingDelay: float | int = 0.1, logLevel: int = 3
+):
     """
     Main function to start the router system.
     """
@@ -102,6 +111,14 @@ def startRouter(host, port, pollingDelay=0.1, logLevel=3):
     app = fastapi.FastAPI()
     app.include_router(br.router)
     level = list(LOG_LEVELS.keys())[logLevel]
-    serverConf = Config(app = app, host=host,  port=port, log_level=LOG_LEVELS[level], ws_ping_interval=10, ws_ping_timeout=None, ws_max_size=1024*1024*1024)
+    serverConf = Config(
+        app=app,
+        host=host,
+        port=int(port),
+        log_level=LOG_LEVELS[level],
+        ws_ping_interval=10,
+        ws_ping_timeout=None,
+        ws_max_size=1024 * 1024 * 1024,
+    )
     server = Server(config=serverConf)
     server.run()

harmoney/runner.py

@@ -1,38 +0,0 @@
-import base64
-from typing import Any, Dict
-from websockets.asyncio import client as WSC
-from websockets.exceptions import WebSocketException
-import asyncio
-import pickle as pkl
-from ._callSpec import _CallPacket
-
-__all__ = ["startRunner"]
-
-async def _send(funcMap: Dict[str, Any], url):
-    """
-    Main logic funcion, connects to the router, takes the incoming task, executes and returns the result.
-    To improve error handling from the mapped function side.
-    """
-    counter=0
-    async with WSC.connect(url, open_timeout=None, ping_interval=10, ping_timeout=None ) as w:
-        try:
-            id = await w.recv()
-            id = int(id)
-            print(f"Starting Runner, ID: {id}")
-            await w.send(base64.b64encode(pkl.dumps({"methods":list(funcMap.keys())})).decode("utf-8"))
-            while True:
-                packetBytes=await w.recv()
-                counter+=1
-                callPk:_CallPacket = pkl.loads(packetBytes)
-                print("-"*50 + f"\nRunning: {callPk.procedure}\nArgs: {callPk.data}\nCounter: {counter}\n" + "-"*50)
-                funcOutput = funcMap[callPk.procedure](**callPk.data)
-                await w.send(base64.b64encode(pkl.dumps(funcOutput)))
-        except WebSocketException as e:
-            print(f"Closing Conncetion with Broker, total call count: {counter}")
-            await w.close()
-
-def startRunner(funcMapping, host, port):
-    """
-    Main function to call from the user code.
-    """
-    asyncio.run(_send(funcMapping, f"ws://{host}:{port}/reg"))

harmoney/runner/__init__.py

@@ -0,0 +1,3 @@
+from .runner import startRunner
+
+__all__ = ["startRunner"]

harmoney/runner/runner.py

@@ -0,0 +1,59 @@
+import asyncio
+import base64
+import pickle as pkl
+from typing import Any, Dict
+
+from websockets.asyncio import client as WSC
+from websockets.exceptions import WebSocketException
+
+from .._callSpec import _CallPacket
+
+__all__ = ["startRunner"]
+
+
+async def _loop(funcMap: Dict[str, Any], url: str, debug=False):
+    """
+    Main logic funcion, connects to the router, takes the incoming task, executes and returns the result.
+    To improve error handling from the mapped function side.
+    """
+    counter = 0
+    async with WSC.connect(
+        url, open_timeout=None, ping_interval=10, ping_timeout=None
+    ) as w:
+        try:
+            id = await w.recv()
+            id = int(id)
+            print(f"Starting Runner with ID: {id}")
+            await w.send(
+                base64.b64encode(pkl.dumps({"methods": list(funcMap.keys())})).decode(
+                    "utf-8"
+                )
+            )
+            while True:
+                packetBytes = await w.recv()
+                counter += 1
+                callPk: _CallPacket = pkl.loads(packetBytes)
+                if debug:
+                    print(
+                        "-" * 50
+                        + f"\nRunning: {callPk.procedure}\nCounter: {counter}\nArgs: {str(callPk.data)[:30]}{'...' if len(str(callPk.data)) >= 30 else ''}\n"
+                        + "-" * 50
+                    )
+                else:
+                    print("-" * 30)
+                funcOutput = funcMap[callPk.procedure](**callPk.data)
+                await w.send(base64.b64encode(pkl.dumps(funcOutput)))
+        except WebSocketException:
+            print(f"Connection closed with Router, total call count: {counter}")
+            await w.close()
+
+
+def startRunner(funcMapping: Dict, host: str, port: str | int, debug: bool = False):
+    """
+    Main function to call from the user code.
+    """
+    try:
+        port = int(str(port))
+    except:
+        raise TypeError(f"Port {port} not valid.")
+    asyncio.run(_loop(funcMapping, f"ws://{host}:{port}/reg", debug))