polyapi-python 0.2.3.dev3__py3-none-any.whl → 0.2.3.dev5__py3-none-any.whl

polyapi/function_cli.py

@@ -3,7 +3,7 @@ import argparse
 import json
 import types
 import sys
-from typing import Dict, List, Tuple
+from typing import Dict, List, Mapping, Optional, Tuple
 from typing_extensions import _TypedDictMeta  # type: ignore
 import requests
 from stdlib_list import stdlib_list
@@ -18,7 +18,7 @@ import importlib
 
 # these libraries are already installed in the base docker image
 # and shouldnt be included in additional requirements
-BASE_REQUIREMENTS = {"polyapi", "requests", "typing_extensions", "jsonschema-gentypes", "pydantic"}
+BASE_REQUIREMENTS = {"polyapi", "requests", "typing_extensions", "jsonschema-gentypes", "pydantic", "cloudevents"}
 all_stdlib_symbols = stdlib_list('.'.join([str(v) for v in sys.version_info[0:2]]))
 BASE_REQUIREMENTS.update(all_stdlib_symbols)  # dont need to pip install stuff in the python standard library
 
@@ -104,6 +104,19 @@ def _get_type(expr: ast.expr | None, schemas: List[Dict]) -> Tuple[str, Dict | N
     return json_type, _get_type_schema(json_type, python_type, schemas)
 
 
+def _get_req_name_if_not_in_base(n: Optional[str], pip_name_lookup: Mapping[str, List[str]]) -> Optional[str]:
+    if not n:
+        return None
+
+    if "." in n:
+        n = n.split(".")[0]
+
+    if n in BASE_REQUIREMENTS:
+        return None
+    else:
+        return pip_name_lookup[n][0]
+
+
 def _parse_code(code: str, function_name: str):
     parsed_args = []
     return_type = None
@@ -121,13 +134,16 @@ def _parse_code(code: str, function_name: str):
 
     for node in ast.iter_child_nodes(parsed_code):
         if isinstance(node, ast.Import):
+            # TODO maybe handle `import foo.bar` case?
             for name in node.names:
-                if name.name not in BASE_REQUIREMENTS:
-                    requirements.append(name.name)
+                req = _get_req_name_if_not_in_base(name.name, pip_name_lookup)
+                if req:
+                    requirements.append(req)
         elif isinstance(node, ast.ImportFrom):
-            if node.module and node.module not in BASE_REQUIREMENTS:
-                req = pip_name_lookup[node.module][0]
-                requirements.append(req)
+            if node.module:
+                req = _get_req_name_if_not_in_base(node.module, pip_name_lookup)
+                if req:
+                    requirements.append(req)
 
         elif isinstance(node, ast.FunctionDef) and node.name == function_name:
             function_args = [arg for arg in node.args.args]

{polyapi_python-0.2.3.dev3.dist-info → polyapi_python-0.2.3.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.2.3.dev3
+Version: 0.2.3.dev5
 Summary: The PolyAPI Python Client
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -31,7 +31,7 @@ License-File: LICENSE
 Requires-Dist: requests ==2.31.0
 Requires-Dist: typing-extensions ==4.10.0
 Requires-Dist: jsonschema-gentypes ==2.4.0
-Requires-Dist: pydantic ==2.5.3
+Requires-Dist: pydantic ==2.6.4
 Requires-Dist: stdlib-list ==0.10.0
 Requires-Dist: colorama ==0.4.4
 Requires-Dist: python-socketio[asyncio_client] ==5.11.1

{polyapi_python-0.2.3.dev3.dist-info → polyapi_python-0.2.3.dev5.dist-info}/RECORD

@@ -8,7 +8,7 @@ polyapi/constants.py,sha256=NGjso6K5rGnE8TGdrXmdEfvvr-HI3DTVGwOYiWO68LM,511
 polyapi/error_handler.py,sha256=vl6ZBtsHmC3eu13IMpmZEXBTDJbrPrzmViBCCrEspd4,1621
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
 polyapi/execute.py,sha256=06XWTxGJqtsDiLY10RjRebIMFRfhtAIMmBRbuWu3e8A,1873
-polyapi/function_cli.py,sha256=x1nAnBQVpjhCDUd_eazQ7HTLgpsNFcY9p6YHy-8iv5E,7660
+polyapi/function_cli.py,sha256=--K-9qYzGjhfg_HxTUwlnQOpDNwt5dkTadQFLUxGr4g,8097
 polyapi/generate.py,sha256=ZZVkA3uL5yPWisnFhIBjoFAYfr96h9m6I0XOCbEpiyk,8970
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/schema.py,sha256=1a7nIO867Xy3bagmPUNdYMxtS5OoCAv8oKIbYgj55dk,2957
@@ -17,8 +17,8 @@ polyapi/typedefs.py,sha256=RZ3I6sgJm_5MuuORG1QjUE-UJy_z2WRXNdiWjEdLvQg,1371
 polyapi/utils.py,sha256=wZQrwSOst5wyoYYLoMk1DnAEbVsJ0-2YkmmDQ9gI3FY,5399
 polyapi/variables.py,sha256=d36-trnfTL_8m2NkorMiImb4O3UrJbiFV38CHxV5i0A,4200
 polyapi/webhook.py,sha256=A89eNnYcVpVe9doJPDLfscIhF-C7Q2AI3vu-SzGxMBg,2923
-polyapi_python-0.2.3.dev3.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.2.3.dev3.dist-info/METADATA,sha256=S_sQaLzN8kWw5UrytVLor2fargI-U23dD_d6A3DEigo,4823
-polyapi_python-0.2.3.dev3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-polyapi_python-0.2.3.dev3.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.2.3.dev3.dist-info/RECORD,,
+polyapi_python-0.2.3.dev5.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.2.3.dev5.dist-info/METADATA,sha256=yLnKqdRKrPJAv2WFXTTsw5z82-_vQKohRRw1fOdNsTw,4823
+polyapi_python-0.2.3.dev5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+polyapi_python-0.2.3.dev5.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.2.3.dev5.dist-info/RECORD,,