polyapi-python 0.3.1.dev16__py3-none-any.whl → 0.3.2__py3-none-any.whl

polyapi/cli.py

@@ -21,7 +21,7 @@ def execute_from_cli():
         description="Manage your Poly API configurations and functions",
         formatter_class=argparse.RawTextHelpFormatter
     )
-    
+
     subparsers = parser.add_subparsers(help="Available commands")
 
     ###########################################################################
@@ -66,13 +66,13 @@ def execute_from_cli():
     fn_add_parser.add_argument("--description", required=False, default="", help="Description of the function")
     fn_add_parser.add_argument("--server", action="store_true", help="Marks the function as a server function")
     fn_add_parser.add_argument("--client", action="store_true", help="Marks the function as a client function")
-    fn_add_parser.add_argument("--logs", choices=["enabled", "disabled"], default="disabled", help="Enable or disable logs for the function.")
+    fn_add_parser.add_argument("--logs", choices=["enabled", "disabled"], default=None, help="Enable or disable logs for the function.")
     fn_add_parser.add_argument("--execution-api-key", required=False, default="", help="API key for execution (for server functions only).")
     fn_add_parser.add_argument("--disable-ai", "--skip-generate", action="store_true", help="Pass --disable-ai skip AI generation of missing descriptions")
 
     def add_function(args):
         initialize_config()
-        logs_enabled = args.logs == "enabled"
+        logs_enabled = args.logs == "enabled" if args.logs else None
         err = ""
         if args.server and args.client:
             err = "Specify either `--server` or `--client`. Found both."

polyapi/deployables.py

@@ -245,7 +245,7 @@ def update_deployment_comments(file_content: str, deployable: dict) -> str:
     if deployable['deployments']:
         deployment_comments = write_deploy_comments(deployable['deployments'])
         deployable['deploymentCommentRanges'] = [(0, len(deployment_comments) + 1)]
-        file_content = f"{deployment_comments}{file_content}"
+        file_content = f"{deployment_comments}\n{file_content}"
     return file_content
 
 def update_deployable_function_comments(file_content: str, deployable: dict, disable_docs: bool = False) -> str:
@@ -261,7 +261,7 @@ def update_deployable_function_comments(file_content: str, deployable: dict, dis
         if deployable["docStartIndex"] == deployable["docEndIndex"]:
             # Function doesn't yet have any docstrings so we need to add additional whitespace
             docstring = "    " + docstring + "\n"
-        
+
         return f"{file_content[:deployable['docStartIndex']]}{docstring}{file_content[deployable['docEndIndex']:]}"
     return file_content
 
@@ -271,17 +271,17 @@ def write_updated_deployable(deployable: dict, disable_docs: bool = False) -> di
     """
     with open(deployable['file'], 'r', encoding='utf-8') as file:
         file_contents = file.read()
-    
+
     if deployable['type'] in ['client-function', 'server-function']:
         file_contents = update_deployable_function_comments(file_contents, deployable, disable_docs)
     else:
         raise ValueError(f"Unsupported deployable type: '{deployable['type']}'")
 
     file_contents = update_deployment_comments(file_contents, deployable)
-    
+
     with open(deployable['file'], 'w', encoding='utf-8') as file:
         file.write(file_contents)
-    
+
     deployable['fileRevision'] = get_deployable_file_revision(file_contents)
     return deployable
 

polyapi/function_cli.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Any, List
+from typing import Any, List, Optional
 import requests
 from polyapi.generate import get_functions_and_parse, generate_functions
 from polyapi.config import get_api_key_and_url
@@ -23,7 +23,7 @@ def function_add_or_update(
     description: str,
     client: bool,
     server: bool,
-    logs_enabled: bool,
+    logs_enabled: Optional[bool],
     generate: bool = True,
     execution_api_key: str = ""
 ):
@@ -45,6 +45,9 @@ def function_add_or_update(
         )
         sys.exit(1)
 
+    if logs_enabled is None:
+        logs_enabled = parsed["config"].get("logs_enabled", None)
+
     data = {
         "context": context or parsed["context"],
         "name": name,
@@ -52,9 +55,8 @@ def function_add_or_update(
         "code": code,
         "language": "python",
         "returnType": get_jsonschema_type(return_type),
-        "returnTypeSchema": parsed["types"]["returns"]["typeSchema"],
-        "arguments": [{**p, "key": p["name"], "type": get_jsonschema_type(p["type"])  } for p in parsed["types"]["params"]],
-        "logsEnabled": logs_enabled or parsed["config"].get("logs_enabled", False),
+        "arguments": [{**p, "key": p["name"], "type": get_jsonschema_type(p["type"])} for p in parsed["types"]["params"]],
+        "logsEnabled": logs_enabled,
     }
 
     if server and parsed["dependencies"]:

polyapi/parser.py

@@ -47,7 +47,7 @@ def _parse_sphinx_docstring(docstring: str) -> Dict[str, Any]:
         "type": "Any"
     }
     current_section = None
-    
+
     for line in lines:
         stripped_line = line.strip()
         if stripped_line.startswith(":param "):
@@ -56,7 +56,7 @@ def _parse_sphinx_docstring(docstring: str) -> Dict[str, Any]:
             param_name = param_name.strip()
             if param_name in params:
                 params[param_name]["description"] = param_desc.strip()
-            else:    
+            else:
                 params[param_name] = { "name": param_name, "type": "", "description": param_desc.strip() }
             current_section = param_name
 
@@ -118,7 +118,7 @@ def _parse_google_docstring(docstring: str) -> Dict[str, Any]:
     for line in lines:
         line = line.rstrip()
         section_match = section_pattern.match(line)
-        
+
         if section_match:
             mode = section_match.group(1).lower()
             continue
@@ -181,7 +181,7 @@ def _get_schemas(code: str) -> List[Dict]:
 
 def get_jsonschema_type(python_type: str):
     if python_type == "Any":
-        return "Any"
+        return "any"
 
     if python_type == "List":
         return "array"
@@ -338,6 +338,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
             "params": [],
             "returns": {
                 "type": "",
+                "typeSchema": None,
                 "description": "",
             }
         },
@@ -364,7 +365,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                 self._line_offsets.append(
                     self._line_offsets[i-1] + len(self._lines[i-1])
                 )
-            
+
             self._extract_deploy_comments()
 
         def visit_AnnAssign(self, node):
@@ -435,13 +436,14 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
 
         def _extract_deploy_comments(self):
             for i in range(len(self._lines)):
-                line = self._lines[i].strip()
+                line = self._lines[i]
                 if line and not line.startswith("#"):
                     return
-                deployment = _parse_deploy_comment(line)
+                deployment = _parse_deploy_comment(line.strip())
                 if deployment:
+                    start = self._line_offsets[i]
                     deployable["deployments"].append(deployment)
-                    deployable["deploymentCommentRanges"].append([self._line_offsets[i], len(line)])
+                    deployable["deploymentCommentRanges"].append([start, start + len(line)])
 
         def visit_Import(self, node: ast.Import):
             # TODO maybe handle `import foo.bar` case?
@@ -471,8 +473,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                         "type": python_type,
                         "description": "",
                     }
-                    if type_schema:
-                        json_arg["typeSchema"] = json.dumps(type_schema)
+                    json_arg["typeSchema"] = json.dumps(type_schema) if type_schema else None
 
                     if docstring_params:
                         try:
@@ -482,7 +483,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                                 if docstring_params[type_index]["type"] != python_type:
                                     deployable["dirty"] = True
                         except:
-                            pass    
+                            pass
                     else:
                         deployable["dirty"] = True
 
@@ -496,7 +497,7 @@ def parse_function_code(code: str, name: Optional[str] = "", context: Optional[s
                     deployable["types"]["returns"]["typeSchema"] = return_type_schema
                 else:
                     deployable["types"]["returns"]["type"] = "Any"
-                
+
         def generic_visit(self, node):
             if hasattr(node, 'lineno') and hasattr(node, 'col_offset'):
                 self._current_offset = self._line_offsets[node.lineno - 1] + node.col_offset

polyapi/sync.py

@@ -84,7 +84,9 @@ def sync_deployable(deployable: SyncDeployment) -> Deployment:
         "fileRevision": deployable["fileRevision"],
     }
 
-def sync_deployables(dry_run: bool, instance: str = os.getenv('POLY_API_BASE_URL')):
+def sync_deployables(dry_run: bool, instance: str | None = None):
+    if not instance:
+        _, instance = get_api_key_and_url()
     prepare_deployable_directory()
     git_revision = get_cache_deployments_revision()
     all_deployables = load_deployable_records()

{polyapi_python-0.3.1.dev16.dist-info → polyapi_python-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyapi-python
-Version: 0.3.1.dev16
+Version: 0.3.2
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: Dan Fellin <dan@polyapi.io>
 License: MIT License
@@ -29,7 +29,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests==2.31.0
-Requires-Dist: typing_extensions==4.10.0
+Requires-Dist: typing_extensions>=4.10.0
 Requires-Dist: jsonschema-gentypes==2.6.0
 Requires-Dist: pydantic==2.6.4
 Requires-Dist: stdlib_list==0.10.0

{polyapi_python-0.3.1.dev16.dist-info → polyapi_python-0.3.2.dist-info}/RECORD

@@ -2,29 +2,29 @@ polyapi/__init__.py,sha256=a1Poy1kaTncYnUg6nWRcTjVm-R1CUQk12UX7VYQ9d5k,616
 polyapi/__main__.py,sha256=V4zhAh_YGxno5f_KSrlkELxcuDh9bR3WSd0n-2r-qQQ,93
 polyapi/api.py,sha256=e-8nOzq6SXD7_YPVBlW82_9wVxDCc8XD9ioMv_QvnH0,1877
 polyapi/auth.py,sha256=zrIGatjba5GwUTNjKj1GHQWTEDP9B-HrSzCKbLFoqvc,5336
-polyapi/cli.py,sha256=nhqJ437ICZWKcP31hcn6YdzrhSFDXEDn1tTJ5TnubEM,8307
+polyapi/cli.py,sha256=GyZWdTPXnOL_gKBPIBk4EiGyyi76vcI9_vrU0q_RWb8,8320
 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=74Bs2kDhyoQhezc0I1V4pi7l-SYg7_zpYrXYPjAePMw,11954
+polyapi/deployables.py,sha256=WVcNNB6W5ZW_-ukf_kK3moRcnwIkC-O4te6vLepjcco,11936
 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=mRXCdxleID4hQhrRzVNZOm8MFmKIfo8Ru7bZcBPnsOY,4186
+polyapi/function_cli.py,sha256=i6q9V3vHIFlhfwu4QNI6adygxW07G08ZxIroJqLe89I,4183
 polyapi/generate.py,sha256=SIRfN7RF3Z7eQ8kSNg4H70LeT7Hmh-Mn5maibvM7kAM,7969
-polyapi/parser.py,sha256=rtI4-SR6v7mqG2vF_P6qgC-qn-M_QG-e95PJUZv92cc,20248
+polyapi/parser.py,sha256=Dqkg7cy9yae9HP4WcPtNzyZxrUrtDsGshFYW-vPvTzE,20263
 polyapi/prepare.py,sha256=Q8CWV4kmZ2dbXYVsud34AgJkj5ymcQ_IcYhLuikc9yk,6659
 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=tv86d6rbA9z_IliX-_esoxry6Ho_DkkVqv3BhiOZcXs,6430
+polyapi/sync.py,sha256=PGdC0feBBjEVrF3d9EluW_OAxbWuzSrfh84czma8kWg,6476
 polyapi/typedefs.py,sha256=U0i30Y9CgoUBWeMUbpM28S8eVOEU9NfdckK1VAop3A0,1994
 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.dev16.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
-polyapi_python-0.3.1.dev16.dist-info/METADATA,sha256=HguVVBsKLZE9v7_k8_R3d3CMGPSHmKmc0QlSj07sbfw,5327
-polyapi_python-0.3.1.dev16.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-polyapi_python-0.3.1.dev16.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.3.1.dev16.dist-info/RECORD,,
+polyapi_python-0.3.2.dist-info/LICENSE,sha256=Hi0kDr56Dsy0uYIwNt4r9G7tI8x8miXRTlyvbeplCP8,1068
+polyapi_python-0.3.2.dist-info/METADATA,sha256=v6_MrKsOJFe1W7nLbnYUP6K83dtac3SP2K4H9-0vTEI,5321
+polyapi_python-0.3.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+polyapi_python-0.3.2.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.3.2.dist-info/RECORD,,