polyapi-python 0.2.4.dev0__tar.gz → 0.2.4.dev2__tar.gz

{polyapi_python-0.2.4.dev0/polyapi_python.egg-info → polyapi_python-0.2.4.dev2}/PKG-INFO

@@ -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.dev2/polyapi/error_handler.py

@@ -0,0 +1,78 @@
+import asyncio
+import copy
+import socketio  # type: ignore
+from typing import Any, Callable, Dict, List, Optional
+
+from polyapi.config import get_api_key_and_url
+
+
+active_handlers: List[Dict[str, Any]] = []
+client = None
+
+
+def prepare():
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(get_client_and_connect())
+    print("Client initialized!")
+
+
+
+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"])
+
+
+async def unregister(data: Dict[str, Any]):
+    print(f"stopping error handler for '{data['path']}'...")
+    assert client
+    await client.emit(
+        "unregisterErrorHandler",
+        data,
+        "/events",
+    )
+
+
+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])
+
+
+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_python-0.2.4.dev0 → polyapi_python-0.2.4.dev2}/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 → polyapi_python-0.2.4.dev2/polyapi_python.egg-info}/PKG-INFO

@@ -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 → polyapi_python-0.2.4.dev2}/polyapi_python.egg-info/requires.txt

@@ -6,4 +6,3 @@ stdlib_list==0.10.0
 colorama==0.4.4
 python-socketio[asyncio_client]==5.11.1
 truststore==0.8.0
-pyjwt==2.3.0

{polyapi_python-0.2.4.dev0 → polyapi_python-0.2.4.dev2}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.2.4.dev0"
+version = "0.2.4.dev2"
 description = "The PolyAPI Python Client"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [
@@ -15,7 +15,6 @@ dependencies = [
     "colorama==0.4.4",
     "python-socketio[asyncio_client]==5.11.1",
     "truststore==0.8.0",
-    "pyjwt==2.3.0",
 ]
 readme = "README.md"
 license = { file = "LICENSE" }

polyapi_python-0.2.4.dev0/polyapi/error_handler.py

@@ -1,52 +0,0 @@
-import asyncio
-import copy
-import socketio  # type: ignore
-from typing import Any, Callable, Dict, Optional
-
-from polyapi.config import get_api_key_and_url
-
-
-local_error_handlers: Dict[str, Any] = {}
-
-
-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()
-
-    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")
-
-        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",
-                )
-
-            if local_error_handlers.get(path):
-                local_error_handlers[path].remove(callback)
-
-        await socket.wait()
-
-        return unregister
-
-    return asyncio.run(_inner())