polyapi-python 0.0.22__tar.gz → 0.0.24__tar.gz

{polyapi-python-0.0.22/polyapi_python.egg-info → polyapi-python-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.0.22
+Version: 0.0.24
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi-python-0.0.22 → polyapi-python-0.0.24}/polyapi/api.py

@@ -1,9 +1,10 @@
 import os
 from typing import Any, Dict, List, Tuple
+
 from polyapi.constants import JSONSCHEMA_TO_PYTHON_TYPE_MAP
 from polyapi.typedefs import PropertySpecification, PropertyType
 from polyapi.utils import append_init, camelCase
-from polyapi.schema import generate_schema_types
+from polyapi.schema import generate_schema_types, clean_title
 
 # map the function type from the spec type to the function execute type
 TEMPLATE_FUNCTION_TYPE_MAP = {
@@ -25,7 +26,8 @@ def {function_name}({args}) -> {return_type_name}:
     data = {data}
     resp = requests.post(url, json=data, headers=headers)
     if resp.status_code != 200 and resp.status_code != 201:
-        raise PolyApiException(f"{{resp.status_code}}: {{resp.content}}")
+        error_content = resp.content.decode("utf-8", errors="ignore")
+        raise PolyApiException(f"{{resp.status_code}}: {{error_content}}")
 
     return {return_action}
 """
@@ -50,7 +52,8 @@ def {function_name}({args}) -> ApiFunctionResponse:
     data = {data}
     resp = requests.post(url, json=data, headers=headers)
     if resp.status_code != 200 and resp.status_code != 201:
-        raise PolyApiException(f"{{resp.status_code}}: {{resp.content}}")
+        error_content = resp.content.decode("utf-8", errors="ignore")
+        raise PolyApiException(f"{{resp.status_code}}: {{error_content}}")
     return ApiFunctionResponse(resp.json())
 """
 
@@ -71,15 +74,15 @@ def _get_type(type_spec: PropertyType) -> Tuple[str, str]:
     elif type_spec["kind"] == "primitive":
         return _map_primitive_types(type_spec["type"]), ""
     elif type_spec["kind"] == "array":
-        # TODO needs to be more general
         if type_spec.get("items"):
             items = type_spec["items"]
             if items.get("$ref"):
                 return "ResponseType", generate_schema_types(type_spec, root="ResponseType")  # type: ignore
             else:
                 item_type, _ = _get_type(items)
-                return_type = f"List[{item_type}]"
-                return return_type, ""
+                title = f"List[{item_type}]"
+                title = clean_title(title)
+                return title, ""
         else:
             return "List", ""
     elif type_spec["kind"] == "void":
@@ -88,25 +91,27 @@ def _get_type(type_spec: PropertyType) -> Tuple[str, str]:
         if type_spec.get("schema"):
             schema = type_spec["schema"]
             title = schema.get("title", "")
-            if not title:
+            if title:
+                assert isinstance(title, str)
+                title = clean_title(title)
+                return title, generate_schema_types(schema, root=title)  # type: ignore
+            elif schema.get("items"):
                 # fallback to schema $ref name if no explicit title
-                # TODO fix type
                 items = schema.get("items")  # type: ignore
-                if not items:
-                    # figure out what it is and fix!
-                    return "Any", ""
-
-                title = items.get("title")
+                title = items.get("title", "")  # type: ignore
                 if not title:
                     # title is actually a reference to another schema
-                    title = items.get("$ref", "")
-                if title:
-                    title = title.rsplit("/", 1)[-1]
-                    title = f'List[{title}]'
-                else:
-                    # TODO figure out what the title should really be here!
-                    title = "Any"
-            return title, generate_schema_types(schema, root=title)  # type: ignore
+                    title = items.get("$ref", "")  # type: ignore
+
+                title = title.rsplit("/", 1)[-1]
+                title = clean_title(title)
+                if not title:
+                    return "List", ""
+
+                title = f'List[{title}]'
+                return title, generate_schema_types(schema, root=title)
+            else:
+                return "Any", ""
         else:
             return "Dict", ""
     elif type_spec["kind"] == "any":

{polyapi-python-0.0.22 → polyapi-python-0.0.24}/polyapi/cli.py

@@ -1,10 +1,10 @@
 import sys
 import argparse
-from .generate import generate
+from .generate import generate, clear
 from .function_cli import function_add_or_update
 
 
-CLI_COMMANDS = ["generate", "function", "help"]
+CLI_COMMANDS = ["generate", "clear", "function", "help"]
 
 
 def execute_from_cli():
@@ -25,5 +25,8 @@ def execute_from_cli():
     elif command == "generate":
         print("Generating...")
         generate()
+    elif command == "clear":
+        print("Clearing the generated library...")
+        clear()
     elif command == "function":
         function_add_or_update(args.context, args.description, args.server, args.logs, args.subcommands)

{polyapi-python-0.0.22 → polyapi-python-0.0.24}/polyapi/generate.py

@@ -23,18 +23,30 @@ def get_specs() -> List:
         raise NotImplementedError(resp.content)
 
 
-def parse_specs(specs: List) -> List[Tuple[str, str, str, List[PropertySpecification], Dict[str, Any]]]:
+def parse_specs(
+    specs: List,
+) -> List[Tuple[str, str, str, List[PropertySpecification], Dict[str, Any]]]:
     api_functions = []
     for spec in specs:
-        if spec['type'] != 'apiFunction' and spec['type'] != 'serverFunction':
+        if spec["type"] != "apiFunction" and spec["type"] != "serverFunction":
             # for now we only support api and server functions
             continue
 
-        function_type = spec['type']
+        function_type = spec["type"]
         function_name = f"poly.{spec['context']}.{spec['name']}"
-        function_id = spec['id']
-        arguments: List[PropertySpecification] = [arg for arg in spec['function']['arguments']]
-        api_functions.append((function_type, function_name, function_id, arguments, spec['function']["returnType"]))
+        function_id = spec["id"]
+        arguments: List[PropertySpecification] = [
+            arg for arg in spec["function"]["arguments"]
+        ]
+        api_functions.append(
+            (
+                function_type,
+                function_name,
+                function_id,
+                arguments,
+                spec["function"]["returnType"],
+            )
+        )
     return api_functions
 
 
@@ -65,7 +77,7 @@ def parse_variables(variables: List) -> List[Tuple[str, str, bool]]:
     rv = []
     for v in variables:
         path = f"vari.{v['context']}.{v['name']}"
-        rv.append((path, v['id'], v['secret']))
+        rv.append((path, v["id"], v["secret"]))
     return rv
 
 
@@ -93,9 +105,23 @@ def generate() -> None:
         full_path = os.path.join(full_path, "poly")
         if not os.path.exists(full_path):
             os.makedirs(full_path)
-        print("No functions exist yet in this tenant! Empty library initialized. Let's add some functions!")
+        print(
+            "No functions exist yet in this tenant! Empty library initialized. Let's add some functions!"
+        )
         exit()
 
     variables = get_variables_and_parse()
     if variables:
-        generate_variables(variables)
+        generate_variables(variables)
+
+
+def clear() -> None:
+    base = os.path.dirname(os.path.abspath(__file__))
+    poly_path = os.path.join(base, "poly")
+    if os.path.exists(poly_path):
+        shutil.rmtree(poly_path)
+
+    vari_path = os.path.join(base, "vari")
+    if os.path.exists(vari_path):
+        shutil.rmtree(vari_path)
+    print("Cleared!")

{polyapi-python-0.0.22 → polyapi-python-0.0.24}/polyapi/schema.py

@@ -72,4 +72,11 @@ def _fix_title(input_data, output) -> str:
             output = _fix_title(v, output)
         elif k == "title":
             output = output.replace(f"class {v.title()}", f"class {v}")
-    return output
+    return output
+
+
+def clean_title(title: str) -> str:
+    """ used by library generation, sometimes functions can be added with spaces in the title
+    or other nonsense. fix them!
+    """
+    return title.replace(" ", "")

{polyapi-python-0.0.22 → polyapi-python-0.0.24/polyapi_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.0.22
+Version: 0.0.24
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License

{polyapi-python-0.0.22 → polyapi-python-0.0.24}/pyproject.toml

@@ -1,6 +1,9 @@
+[build-system]
+requires = ["setuptools>=61.2", "wheel"]
+
 [project]
 name = "polyapi-python"
-version = "0.0.22"
+version = "0.0.24"
 description = "The PolyAPI Python Client"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = ["requests", "typing_extensions", "jsonschema-gentypes", "pydantic>=2.5.3", "stdlib_list"]
@@ -10,3 +13,10 @@ requires-python = ">=3.10"
 
 [project.urls]
 Homepage = "https://github.com/polyapi/polyapi-python"
+
+[tool.setuptools]
+packages = ["polyapi"]
+
+[tools.setuptools.packages.find]
+include = ["polyapi"]
+exclude = ["polyapi/poly*", "polyapi/vari*"]  # exclude the generated libraries from builds