polyapi-python 0.3.9.dev1__py3-none-any.whl → 0.3.9.dev3__py3-none-any.whl

polyapi/deployables.py

@@ -118,13 +118,13 @@ def get_all_deployable_files_windows(config: PolyDeployConfig) -> List[str]:
     pattern = ' '.join(f"/C:\"polyConfig: {name}\"" for name in config["type_names"]) or '/C:"polyConfig"'
 
     exclude_command = f" | findstr /V /I \"{exclude_pattern}\"" if exclude_pattern else ''
-    search_command = f" | findstr /S /M /I /F:/ {pattern} *.*"
+    search_command = f" | findstr /M /I /F:/ {pattern}"
 
     result = []
     for dir_path in config["include_dirs"]:
         if dir_path != '.':
             include_pattern = " ".join(f"{dir_path}*.{f}" for f in config["include_files_or_extensions"]) or "*"
-        dir_command = f"dir {include_pattern} /S /P /B > NUL"
+        dir_command = f"dir {include_pattern} /S /P /B"
         full_command = f"{dir_command}{exclude_command}{search_command}"
         try:
             output = subprocess.check_output(full_command, shell=True, text=True)

polyapi/execute.py

@@ -1,5 +1,6 @@
 from typing import Dict, Optional
 import requests
+import os
 from requests import Response
 from polyapi.config import get_api_key_and_url, get_mtls_config
 from polyapi.exceptions import PolyApiException
@@ -13,7 +14,11 @@ def direct_execute(function_type, function_id, data) -> Response:
     
     endpoint_info = requests.post(url, json=data, headers=headers)
     if endpoint_info.status_code < 200 or endpoint_info.status_code >= 300:
-        raise PolyApiException(f"{endpoint_info.status_code}: {endpoint_info.content.decode('utf-8', errors='ignore')}")
+        error_content = endpoint_info.content.decode("utf-8", errors="ignore")
+        if function_type == 'api' and os.getenv("LOGS_ENABLED"):
+            raise PolyApiException(f"Error executing api function with id: {function_id}. Status code: {endpoint_info.status_code}. Request data: {data}, Response: {error_content}")
+        elif function_type != 'api':
+            raise PolyApiException(f"{endpoint_info.status_code}: {error_content}")
     
     endpoint_info_data = endpoint_info.json()
     request_params = endpoint_info_data.copy()
@@ -38,9 +43,12 @@ def direct_execute(function_type, function_id, data) -> Response:
             **request_params
         )
 
-    if resp.status_code < 200 or resp.status_code >= 300:
+    if (resp.status_code < 200 or resp.status_code >= 300):
         error_content = resp.content.decode("utf-8", errors="ignore")
-        raise PolyApiException(f"{resp.status_code}: {error_content}")
+        if function_type == 'api' and os.getenv("LOGS_ENABLED"):
+            raise PolyApiException(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}")
+        elif function_type != 'api':   
+            raise PolyApiException(f"{resp.status_code}: {error_content}")    
     
     return resp
 
@@ -59,9 +67,12 @@ def execute(function_type, function_id, data) -> Response:
         headers=headers,
     )
 
-    if resp.status_code < 200 or resp.status_code >= 300:
+    if (resp.status_code < 200 or resp.status_code >= 300) and os.getenv("LOGS_ENABLED"):
         error_content = resp.content.decode("utf-8", errors="ignore")
-        raise PolyApiException(f"{resp.status_code}: {error_content}")
+        if function_type == 'api' and os.getenv("LOGS_ENABLED"):
+            raise PolyApiException(f"Error executing api function with id: {function_id}. Status code: {resp.status_code}. Request data: {data}, Response: {error_content}")
+        elif function_type != 'api':
+            raise PolyApiException(f"{resp.status_code}: {error_content}")
 
     return resp
 

polyapi/prepare.py

@@ -138,11 +138,13 @@ def prepare_deployables(lazy: bool = False, disable_docs: bool = False, disable_
             write_updated_deployable(deployable, disable_docs)
         # Re-stage any updated staged files.
         staged = subprocess.check_output('git diff --name-only --cached', shell=True, text=True, ).split('\n')
+        rootPath = subprocess.check_output('git rev-parse --show-toplevel', shell=True, text=True).replace('\n', '')
         for deployable in dirty_deployables:
             try:
-                if deployable["file"] in staged:
-                    print(f'Staging {deployable["file"]}')
-                    subprocess.run(['git', 'add', deployable["file"]])
+                deployableName = deployable["file"].replace('\\', '/').replace(f"{rootPath}/", '')
+                if deployableName in staged:
+                    print(f'Staging {deployableName}')
+                    subprocess.run(['git', 'add', deployableName])
             except:
                 print('Warning: File staging failed, check that all files are staged properly.')
 

{polyapi_python-0.3.9.dev1.dist-info → polyapi_python-0.3.9.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.9.dev1
+Version: 0.3.9.dev3
 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.9.dev1.dist-info → polyapi_python-0.3.9.dev3.dist-info}/RECORD

@@ -6,15 +6,15 @@ polyapi/cli.py,sha256=unKqAoZ1hTGAeyYRfNQ6jO15Um7N4F95k__1qFue5bI,10659
 polyapi/client.py,sha256=DW6ljG_xCwAo2yz23A9QfLooE6ZUDvSpdA4e_dCQjiQ,1418
 polyapi/config.py,sha256=cAMv2n9tGN_BTvqt7V32o5F86qRhxAKyey_PoId2D8s,7638
 polyapi/constants.py,sha256=sc-FnS0SngBLvSu1ZWMs0UCf9EYD1u1Yhfr-sZXGLns,607
-polyapi/deployables.py,sha256=8x-Y7MlpWnTqsWhidmO6yVZe2nTChzma6hJNVsfg94s,12113
+polyapi/deployables.py,sha256=vaZvdkPpwgjVtRXD4IxFsJ90Qmgs-AOIB3ygy4QCG78,12100
 polyapi/error_handler.py,sha256=I_e0iz6VM23FLVQWJljxs2NGcl_OODbi43OcbnqBlp8,2398
 polyapi/exceptions.py,sha256=Zh7i7eCUhDuXEdUYjatkLFTeZkrx1BJ1P5ePgbJ9eIY,89
-polyapi/execute.py,sha256=sjI6BMBYPSCD6UngV9DzpJIRSU6p02aShNaTXhDExtY,3457
+polyapi/execute.py,sha256=QAioIrfGUQ5D5DgN6V9QgSLanow1FSu8zbe0_hLeoJk,4392
 polyapi/function_cli.py,sha256=H0sVrbvRBXw_xeApe2MvQw8p_xE7jVTTOU-07Dg041A,4220
 polyapi/generate.py,sha256=slCw9AOvQHQ8UtEaumFI1NoRvjH2Dj3Y33u7imQqi8c,19521
 polyapi/parser.py,sha256=20ZE7kSXx3UL7QVSIYYxzsnJlygVbsaDAg9q7c41WxQ,20695
 polyapi/poly_schemas.py,sha256=fZ6AGvHcOKQJtlrzSuzeBNed5DxPMA2dJGdJvuFCHWM,9066
-polyapi/prepare.py,sha256=pRWBhpgqMtKP04P9F6PIA3eCkOpCxQSv9TZdR3qR34I,7216
+polyapi/prepare.py,sha256=NQzpMIoakNovStvOGOmqSYIpTwiWXaweNSE9se10A2E,7420
 polyapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 polyapi/rendered_spec.py,sha256=nJEj2vRgG3N20fU4s-ThRtOIwAuTzXwXuOBIkXljDVc,2240
 polyapi/schema.py,sha256=-mtRV5iL3CV0X3phXhGYFV8sLz0KouTACOKWyGO9Pwc,5309
@@ -24,8 +24,8 @@ polyapi/typedefs.py,sha256=vJLZYBNmR3i8yQEDYlu1UfvtJyg6E1R1QyGlgFUm2rU,2362
 polyapi/utils.py,sha256=1F7Dwst_PbPuUBUSxx5r8d2DHDgqHtu07QW92T_YSdw,12454
 polyapi/variables.py,sha256=VAp2d5I-4WLYHCPF1w3pqU4-z8_XRQpYW-ddOw6G5S4,7268
 polyapi/webhook.py,sha256=gWYXHz0PnB_uY_lnHeUlg3EIHfTGwF-Tc6UaatldZBw,5333
-polyapi_python-0.3.9.dev1.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
-polyapi_python-0.3.9.dev1.dist-info/METADATA,sha256=W5sXQ5iF_6nU9kdOkYyklEaVVBuG6F3N9nzlv4xhfUk,5784
-polyapi_python-0.3.9.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-polyapi_python-0.3.9.dev1.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
-polyapi_python-0.3.9.dev1.dist-info/RECORD,,
+polyapi_python-0.3.9.dev3.dist-info/licenses/LICENSE,sha256=6b_I7aPVp8JXhqQwdw7_B84Ca0S4JGjHj0sr_1VOdB4,1068
+polyapi_python-0.3.9.dev3.dist-info/METADATA,sha256=cbebN9zVLGi1vsUCUTonVznBUG6heRJjSWS2LEpYEGo,5784
+polyapi_python-0.3.9.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+polyapi_python-0.3.9.dev3.dist-info/top_level.txt,sha256=CEFllOnzowci_50RYJac-M54KD2IdAptFsayVVF_f04,8
+polyapi_python-0.3.9.dev3.dist-info/RECORD,,