polyapi-python 0.2.4.dev0__py3-none-any.whl → 0.2.4.dev2__py3-none-any.whl

polyapi/error_handler.py

@@ -1,52 +1,78 @@
 import asyncio
 import copy
 import socketio  # type: ignore
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Dict, List, Optional
 
 from polyapi.config import get_api_key_and_url
 
 
-local_error_handlers: Dict[str, Any] = {}
+active_handlers: List[Dict[str, Any]] = []
+client = None
 
 
-def on(path: str, callback: Callable, options: Optional[Dict[str, Any]] = None) -> Callable:
-    assert not local_error_handlers
-    socket = socketio.AsyncClient()
-    api_key, base_url = get_api_key_and_url()
+def prepare():
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(get_client_and_connect())
+    print("Client initialized!")
 
-    async def _inner():
-        await socket.connect(base_url, transports=["websocket"], namespaces=["/events"])
 
-        handler_id = None
-        data = copy.deepcopy(options or {})
-        data["path"] = path
-        data["apiKey"] = api_key
 
-        def registerCallback(id: int):
-            nonlocal handler_id, socket
-            handler_id = id
-            socket.on(f"handleError:{handler_id}", callback, namespace="/events")
+async def get_client_and_connect():
+    _, base_url = get_api_key_and_url()
+    global client
+    client = socketio.AsyncClient()
+    await client.connect(base_url, transports=["websocket"], namespaces=["/events"])
 
-        await socket.emit("registerErrorHandler", data, "/events", registerCallback)
-        if local_error_handlers.get(path):
-            local_error_handlers[path].append(callback)
-        else:
-            local_error_handlers[path] = [callback]
 
-        async def unregister():
-            nonlocal handler_id, socket
-            if handler_id and socket:
-                await socket.emit(
-                    "unregisterErrorHandler",
-                    {"id": handler_id, "path": path, "apiKey": api_key},
-                    namespace="/events",
-                )
+async def unregister(data: Dict[str, Any]):
+    print(f"stopping error handler for '{data['path']}'...")
+    assert client
+    await client.emit(
+        "unregisterErrorHandler",
+        data,
+        "/events",
+    )
 
-            if local_error_handlers.get(path):
-                local_error_handlers[path].remove(callback)
 
-        await socket.wait()
+async def unregister_all():
+    _, base_url = get_api_key_and_url()
+    # need to reconnect because maybe socketio client disconnected after Ctrl+C?
+    await client.connect(base_url, transports=["websocket"], namespaces=["/events"])
+    await asyncio.gather(*[unregister(handler) for handler in active_handlers])
 
-        return unregister
 
-    return asyncio.run(_inner())
+async def on(
+    path: str, callback: Callable, options: Optional[Dict[str, Any]] = None
+) -> None:
+    print(f"starting error handler for {path}...")
+
+    if not client:
+        raise Exception("Client not initialized. Please call error_handler.prepare() first.")
+
+    api_key, _ = get_api_key_and_url()
+    handler_id = None
+    data = copy.deepcopy(options or {})
+    data["path"] = path
+    data["apiKey"] = api_key
+
+    def registerCallback(id: int):
+        nonlocal handler_id
+        handler_id = id
+        client.on(f"handleError:{handler_id}", callback, namespace="/events")
+        active_handlers.append({"path": path, "id": handler_id, "apiKey": api_key})
+
+    await client.emit("registerErrorHandler", data, "/events", registerCallback)
+
+
+def start(*args):
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(get_client_and_connect())
+    asyncio.gather(*args)
+
+    try:
+        loop.run_forever()
+    except KeyboardInterrupt:
+        pass
+    finally:
+        loop.run_until_complete(unregister_all())
+        loop.stop()

polyapi/server.py

@@ -18,7 +18,10 @@ def {function_name}(
     Function ID: {function_id}
     \"""
     resp = execute("{function_type}", "{function_id}", {data})
-    return {return_action}
+    try:
+        return {return_action}
+    except:
+        return resp.text
 """
 
 
@@ -54,14 +57,6 @@ def render_server_function(
 def _get_server_return_action(return_type_name: str) -> str:
     if return_type_name == "str":
         return_action = "resp.text"
-    elif return_type_name == "Any":
-        return_action = "resp.text"
-    elif return_type_name == "int":
-        return_action = "int(resp.text.replace('(int) ', ''))"
-    elif return_type_name == "float":
-        return_action = "float(resp.text.replace('(float) ', ''))"
-    elif return_type_name == "bool":
-        return_action = "False if resp.text == 'False' else True"
     else:
         return_action = "resp.json()"
     return return_action

{polyapi_python-0.2.4.dev0.dist-info → polyapi_python-0.2.4.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.4.dev0
+Version: 0.2.4.dev2
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -36,7 +36,6 @@ Requires-Dist: stdlib-list ==0.10.0
 Requires-Dist: colorama ==0.4.4
 Requires-Dist: python-socketio[asyncio_client] ==5.11.1
 Requires-Dist: truststore ==0.8.0
-Requires-Dist: pyjwt ==2.3.0
 
 # PolyAPI Python Library
 

{polyapi_python-0.2.4.dev0.dist-info → polyapi_python-0.2.4.dev2.dist-info}/RECORD

@@ -6,20 +6,20 @@ polyapi/cli.py,sha256=xlKH4cSmSo7eXbyXCLWyL4rXM1QFsltC_MxoxMPgt6I,2187
 polyapi/client.py,sha256=8k50Vwg9HnmHHTyfKH1vfMJqF0jnnVMsWuWI9AfASkM,761
 polyapi/config.py,sha256=S8TU10upy5OW1_vX-CqQTJD-ZOB6329aMjiUCmukfUI,2292
 polyapi/constants.py,sha256=NGjso6K5rGnE8TGdrXmdEfvvr-HI3DTVGwOYiWO68LM,511
-polyapi/error_handler.py,sha256=vl6ZBtsHmC3eu13IMpmZEXBTDJbrPrzmViBCCrEspd4,1621
+polyapi/error_handler.py,sha256=frP8-76DQx5n2hp3sBMt6586ibE4zryh2M-PvooScb0,2169
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
 polyapi/execute.py,sha256=06XWTxGJqtsDiLY10RjRebIMFRfhtAIMmBRbuWu3e8A,1873
 polyapi/function_cli.py,sha256=KkFvnGSSCwYPMV4cX4yMQmXKyLtgYR64Fz5BfjGv3qY,8230
 polyapi/generate.py,sha256=O1lb7rLsce7tItIrMx1EbWzRlAKKOp-7upNM80cMmMw,8499
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/schema.py,sha256=1a7nIO867Xy3bagmPUNdYMxtS5OoCAv8oKIbYgj55dk,2957
-polyapi/server.py,sha256=mcbH8pG16fFMiFL52wdii0217ZLsznQnElAFEvXZ7IA,2211
+polyapi/server.py,sha256=iXUR1Kd5TnWK-V5qHhvFvQuHx-3IcTv8WChXVY5Mbog,1882
 polyapi/typedefs.py,sha256=a5WfHaAvjeql3y1iA3_SkpUztTbKvS5bPqkVxkCvr9E,1459
 polyapi/utils.py,sha256=UD3uV3kzt2w23zxAdHCUROhdvtdO44KCJIpqnFwEhqE,5937
 polyapi/variables.py,sha256=d36-trnfTL_8m2NkorMiImb4O3UrJbiFV38CHxV5i0A,4200
 polyapi/webhook.py,sha256=A89eNnYcVpVe9doJPDLfscIhF-C7Q2AI3vu-SzGxMBg,2923
-polyapi_python-0.2.4.dev0.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.2.4.dev0.dist-info/METADATA,sha256=2iBHZcuKXucSmRmuZenDt-1JdDAbLn3wdAI1az8x2O8,4852
-polyapi_python-0.2.4.dev0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-polyapi_python-0.2.4.dev0.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.2.4.dev0.dist-info/RECORD,,
+polyapi_python-0.2.4.dev2.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.2.4.dev2.dist-info/METADATA,sha256=rqisf041u3SL5f87CuxkwJi564KBlM4Qx102MB7z3mk,4823
+polyapi_python-0.2.4.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+polyapi_python-0.2.4.dev2.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.2.4.dev2.dist-info/RECORD,,