polyapi-python 0.2.4.dev8__py3-none-any.whl → 0.2.4.dev10__py3-none-any.whl

polyapi/error_handler.py

@@ -1,6 +1,7 @@
 import asyncio
 import copy
 import socketio  # type: ignore
+from socketio.exceptions import ConnectionError  # type: ignore
 from typing import Any, Callable, Dict, List, Optional
 
 from polyapi.config import get_api_key_and_url
@@ -28,7 +29,7 @@ async def get_client_and_connect():
 
 
 async def unregister(data: Dict[str, Any]):
-    print(f"stopping error handler for '{data['path']}'...")
+    print(f"Stopping error handler for {data['path']}...")
     assert client
     await client.emit(
         "unregisterErrorHandler",
@@ -40,14 +41,17 @@ async def unregister(data: Dict[str, Any]):
 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"])
+    try:
+        await client.connect(base_url, transports=["websocket"], namespaces=["/events"])
+    except ConnectionError:
+        pass
     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}...")
+    print(f"Starting error handler for {path}...")
 
     if not client:
         raise Exception("Client not initialized. Abort!")

polyapi/generate.py

@@ -176,6 +176,7 @@ def render_spec(spec: SpecificationDto):
     function_type = spec["type"]
     function_description = spec["description"]
     function_name = spec["name"]
+    function_context = spec["context"]
     function_id = spec["id"]
 
     arguments: List[PropertySpecification] = []
@@ -223,6 +224,7 @@ def render_spec(spec: SpecificationDto):
     elif function_type == "webhookHandle":
         func_str, func_type_defs = render_webhook_handle(
             function_type,
+            function_context,
             function_name,
             function_id,
             function_description,

polyapi/utils.py

@@ -165,4 +165,13 @@ def parse_arguments(function_name: str, arguments: List[PropertySpecification])
                 arg_string += f",  # {description}\n"
         else:
             arg_string += ",\n"
-    return arg_string.rstrip("\n"), "\n\n".join(args_def)
+    return arg_string.rstrip("\n"), "\n\n".join(args_def)
+
+
+def poly_full_path(context, name) -> str:
+    """get the functions path as it will be exposed in the poly library"""
+    if context:
+        path = context + "." + name
+    else:
+        path = name
+    return f"poly.{path}"

polyapi/webhook.py

@@ -1,10 +1,12 @@
 import asyncio
 import socketio  # type: ignore
+from socketio.exceptions import ConnectionError  # type: ignore
 import uuid
 from typing import Any, Dict, List, Tuple
 
 from polyapi.config import get_api_key_and_url
 from polyapi.typedefs import PropertySpecification
+from polyapi.utils import poly_full_path
 
 # all active webhook handlers, used by unregister_all to cleanup
 active_handlers: List[Dict[str, Any]] = []
@@ -23,7 +25,7 @@ async def {function_name}(callback, options=None):
     \"""
     from polyapi.webhook import client, active_handlers
 
-    print("Starting webhook for {function_name}...")
+    print("Starting webhook for {function_path}...")
 
     if not client:
         raise Exception("Client not initialized. Abort!")
@@ -65,7 +67,7 @@ async def {function_name}(callback, options=None):
         "waitForResponse": options.get("waitForResponse"),
     }}
     await client.emit('registerWebhookEventHandler', data, namespace="/events", callback=registerCallback)
-    active_handlers.append({{"clientID": eventsClientId, "webhookHandleID": function_id, "apiKey": api_key}})
+    active_handlers.append({{"clientID": eventsClientId, "webhookHandleID": function_id, "apiKey": api_key, "path": "{function_path}"}})
 """
 
 
@@ -77,7 +79,7 @@ async def get_client_and_connect():
 
 
 async def unregister(data: Dict[str, Any]):
-    print(f"stopping webhook handler for '{data['webhookHandleID']}'...")
+    print(f"Stopping webhook handler for {data['path']}...")
     assert client
     await client.emit(
         "unregisterWebhookEventHandler",
@@ -92,13 +94,18 @@ async def unregister(data: Dict[str, Any]):
 
 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"])
+    # maybe need to reconnect because maybe socketio client disconnected after Ctrl+C?
+    # feels like Linux disconnects but Windows stays connected
+    try:
+        await client.connect(base_url, transports=["websocket"], namespaces=["/events"])
+    except ConnectionError:
+        pass
     await asyncio.gather(*[unregister(handler) for handler in active_handlers])
 
 
 def render_webhook_handle(
     function_type: str,
+    function_context: str,
     function_name: str,
     function_id: str,
     function_description: str,
@@ -110,6 +117,7 @@ def render_webhook_handle(
         client_id=uuid.uuid4().hex,
         function_id=function_id,
         function_name=function_name,
+        function_path=poly_full_path(function_context, function_name),
     )
 
     return func_str, ""

{polyapi_python-0.2.4.dev8.dist-info → polyapi_python-0.2.4.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.4.dev8
+Version: 0.2.4.dev10
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi_python-0.2.4.dev8.dist-info → polyapi_python-0.2.4.dev10.dist-info}/RECORD

@@ -6,21 +6,21 @@ 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=i_jtG6qBBUgU8z1poT8PN1wB9sHgBP1zeLSW24fSO00,2282
+polyapi/error_handler.py,sha256=I_e0iz6VM23FLVQWJljxs2NGcl_OODbi43OcbnqBlp8,2398
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
 polyapi/execute.py,sha256=kXnvlNQ7nz9cRlV2_5gXH09UCmyiDP5zi3wiAw0uDuk,1943
 polyapi/function_cli.py,sha256=F0cb5MGcmFvspgwxptWq_2e50X5NNno0B0p8Vgu_oNI,9129
-polyapi/generate.py,sha256=O1lb7rLsce7tItIrMx1EbWzRlAKKOp-7upNM80cMmMw,8499
+polyapi/generate.py,sha256=fNEBy3ALEu4m1GEEcly-5u-Y1i3G6EWMKKgCyBBJsqc,8568
 polyapi/poly_custom.py,sha256=IQRZIMGs0CXotbn71_wyHMinSkoBwKdFdgv90VLYV90,173
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/schema.py,sha256=1a7nIO867Xy3bagmPUNdYMxtS5OoCAv8oKIbYgj55dk,2957
 polyapi/server.py,sha256=iXUR1Kd5TnWK-V5qHhvFvQuHx-3IcTv8WChXVY5Mbog,1882
 polyapi/typedefs.py,sha256=a5WfHaAvjeql3y1iA3_SkpUztTbKvS5bPqkVxkCvr9E,1459
-polyapi/utils.py,sha256=UD3uV3kzt2w23zxAdHCUROhdvtdO44KCJIpqnFwEhqE,5937
+polyapi/utils.py,sha256=86OSrkXlaB0HZppkItT9Xp3m2LBfIT4nPIhyBkIJ0OU,6164
 polyapi/variables.py,sha256=d36-trnfTL_8m2NkorMiImb4O3UrJbiFV38CHxV5i0A,4200
-polyapi/webhook.py,sha256=AAioBn4H3gp7Zaxyp5_MnW-61rAIggi4T6WisgHpz1k,3977
-polyapi_python-0.2.4.dev8.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.2.4.dev8.dist-info/METADATA,sha256=VEizn1nBPNVNIOSUSeT67sxfd33N4AKxagz6IyHkcZU,4867
-polyapi_python-0.2.4.dev8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-polyapi_python-0.2.4.dev8.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.2.4.dev8.dist-info/RECORD,,
+polyapi/webhook.py,sha256=bNDfdeFGaRHk8yFAvGK94Pys9jZQ48q8bO9BV579DC8,4317
+polyapi_python-0.2.4.dev10.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.2.4.dev10.dist-info/METADATA,sha256=eCYlh-nZAnYdlaSuywh_kGcbrelBV0qZjxXeyOGUfDM,4868
+polyapi_python-0.2.4.dev10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+polyapi_python-0.2.4.dev10.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.2.4.dev10.dist-info/RECORD,,