polyapi-python 0.3.1.dev4__py3-none-any.whl → 0.3.1.dev6__py3-none-any.whl

polyapi/deployables.py

@@ -64,9 +64,10 @@ class SyncDeployment(TypedDict, total=False):
     context: str
     name: str
     description: str
-    type: str  # This should be an enumeration or a predefined set of strings if you have known types.
+    type: str
     fileRevision: str
     file: str
+    types: DeployableFunctionTypes
     typeSchemas: Dict[str, any]
     dependencies: List[str]
     config: Dict[str, any]

polyapi/sync.py

@@ -3,6 +3,7 @@ from datetime import datetime
 from typing import List, Dict
 import requests
 
+from polyapi.parser import get_jsonschema_type
 from polyapi.deployables import (
     prepare_deployable_directory, load_deployable_records,
     save_deployable_records, remove_deployable_records,
@@ -25,31 +26,43 @@ def group_by(items: List[Dict], key: str) -> Dict[str, List[Dict]]:
         grouped.setdefault(item[key], []).append(item)
     return grouped
 
-def remove_deployable(deployable: SyncDeployment) -> bool:
-    # Example function call, adjust as needed
-    url = f"{deployable['instance']}/{deployable['type']}/{deployable['name']}"
+def remove_deployable_function(deployable: SyncDeployment) -> bool:
+    url = f'{deployable["instance"]}/functions/{deployable["type"].replace("-function", "")}/{deployable['id']}'
     response = requests.get(url)
     if response.status_code != 200:
         return False
     requests.delete(url)
     return True
 
-def sync_deployable_and_get_id(deployable: SyncDeployment, code: str) -> str:
-    # Example function call, adjust as needed
-    url = f"{deployable['instance']}/{deployable['type']}"
-    print(deployable)
+def remove_deployable(deployable: SyncDeployment) -> bool:
+
+    if deployable["type"] == 'client-function' or deployable["type"] == 'server-function':
+        return remove_deployable_function(deployable)
+
+    raise Exception(f"Unsupported deployable type '{deployable['type']}'")
+
+def sync_function_and_get_id(deployable: SyncDeployment, code: str) -> str:
+    url = f'{deployable["instance"]}/functions/{deployable["type"].replace("-function", "")}'
     payload = {
         "context": deployable["context"],
         "name": deployable["name"],
         "description": deployable["description"],
         "code": code,
         "typeSchemas": deployable["typeSchemas"],
-        "config": deployable["config"]
+        **deployable["config"],
+        "arguments": [{**p, "type": get_jsonschema_type(p["type"])  } for p in deployable["types"]["params"]],
     }
     response = requests.post(url, json=payload)
     response.raise_for_status()
     return response.json()['id']
 
+def sync_deployable_and_get_id(deployable: SyncDeployment, code: str) -> str:
+
+    if deployable["type"] == 'client-function' or deployable["type"] == 'server-function':
+        return sync_function_and_get_id(deployable, code)
+
+    raise Exception(f"Unsupported deployable type '{deployable['type']}'")
+
 def sync_deployable(deployable: SyncDeployment) -> Deployment:
     code = read_file(deployable['file'])
     id = sync_deployable_and_get_id(deployable, code)
@@ -93,12 +106,16 @@ def sync_deployables(dry_run: bool, instance: str = os.getenv('POLY_API_BASE_URL
                 # Any deployable may be deployed to multiple instances/environments at the same time
                 # So we reduce the deployable record down to a single instance we want to deploy to
                 if previous_deployment:
-                    sync_deployment = { **deployable, **previous_deployment, "instance": instance }
+                    sync_deployment = {
+                        **deployable,
+                        **previous_deployment,
+                        "description": deployable["types"]["description"],
+                        "instance": instance
+                    }
                 else:
                     sync_deployment = { **deployable, "instance": instance }
                 if git_revision == deployable['gitRevision']:
                     deployment = sync_deployable(sync_deployment)
-                    print(deployment)
                     if previous_deployment:
                         previous_deployment.update(deployment)
                     else:

{polyapi_python-0.3.1.dev4.dist-info → polyapi_python-0.3.1.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.3.1.dev4
+Version: 0.3.1.dev6
 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.3.1.dev4.dist-info → polyapi_python-0.3.1.dev6.dist-info}/RECORD

@@ -6,7 +6,7 @@ polyapi/cli.py,sha256=wXR5UE73nk26WQRbE8yK69h3h5udNrZFr85ORhbPnRs,8251
 polyapi/client.py,sha256=CoFDYvyKsqL4wPQbUDIr0Qb8Q5eD92xN4OEEcJEVuGQ,1296
 polyapi/config.py,sha256=uvEvOfWYZTLmBmZX-5jJxCzWPpwzVmEOIiQIdi98P4Y,3015
 polyapi/constants.py,sha256=sc-FnS0SngBLvSu1ZWMs0UCf9EYD1u1Yhfr-sZXGLns,607
-polyapi/deployables.py,sha256=L2n0Gx5Ih3NBhjCD8FL0DnmTRasTgQK56aRo8ntZOyo,12010
+polyapi/deployables.py,sha256=qKoyuPUv46yZoLBvSOmk6JsBWqomwJAkadhItp8Lx40,11956
 polyapi/error_handler.py,sha256=I_e0iz6VM23FLVQWJljxs2NGcl_OODbi43OcbnqBlp8,2398
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
 polyapi/execute.py,sha256=kXnvlNQ7nz9cRlV2_5gXH09UCmyiDP5zi3wiAw0uDuk,1943
@@ -18,13 +18,13 @@ polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/rendered_spec.py,sha256=uaNzBhP4cX7iGfKwzZv0dxMagWzsGeDr0cQYx_AyIhQ,2153
 polyapi/schema.py,sha256=VVMHAT5yU47cRC7xF44BrmUSemlk5oIKSxH2HTVPaQ8,3169
 polyapi/server.py,sha256=NzQCZFSAJK7XiRw1kiU_i9uMvgYK7i8qh7UX2xjytJU,1908
-polyapi/sync.py,sha256=JZ0Q8QCu8IgdwDIhO8PtDPagcmVanrtGqJIMdLDmai4,5051
+polyapi/sync.py,sha256=LSSpVpCN41AqCk5i08RAr6HVoimf-t0L9f451WdIiTA,5879
 polyapi/typedefs.py,sha256=jmKprGFQSxmJXvwV53p-MFMcStmTp-tsgsynWjoVmU0,1986
 polyapi/utils.py,sha256=jzCh-ivKMcgp5fIXynhYmP9UyzsISr9bGGEzdPP8n3w,7644
 polyapi/variables.py,sha256=d36-trnfTL_8m2NkorMiImb4O3UrJbiFV38CHxV5i0A,4200
 polyapi/webhook.py,sha256=LWv28c2MLz_OKBI_Nn7WR4C-gs1SWgbdXsoxIIf-9UI,4886
-polyapi_python-0.3.1.dev4.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.3.1.dev4.dist-info/METADATA,sha256=AjPecgfD0Sxawugfe8-xdNtUxgkJHiTzL6HBM8E9KTA,5326
-polyapi_python-0.3.1.dev4.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-polyapi_python-0.3.1.dev4.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.3.1.dev4.dist-info/RECORD,,
+polyapi_python-0.3.1.dev6.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.3.1.dev6.dist-info/METADATA,sha256=11a__aaaOPkQEe9K4sp_P-b8d2D2R5zbCJY0gCujRc0,5326
+polyapi_python-0.3.1.dev6.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+polyapi_python-0.3.1.dev6.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.3.1.dev6.dist-info/RECORD,,