port-ocean 0.14.5__py3-none-any.whl → 0.14.7__py3-none-any.whl

port_ocean/clients/port/authentication.py

@@ -1,3 +1,4 @@
+import re
 from typing import Any
 
 import httpx
@@ -17,7 +18,7 @@ class TokenResponse(BaseModel):
 
     @property
     def expired(self) -> bool:
-        return self._retrieved_time + self.expires_in < get_time()
+        return self._retrieved_time + self.expires_in <= get_time()
 
     @property
     def full_token(self) -> str:
@@ -46,7 +47,11 @@ class PortAuthentication:
 
     async def _get_token(self, client_id: str, client_secret: str) -> TokenResponse:
         logger.info(f"Fetching access token for clientId: {client_id}")
-
+        if self._is_personal_token(client_id):
+            logger.warning(
+                "Integration is using personal credentials, make sure to use machine credentials. "
+                "Usage of personal credentials might impose unexpected integration behavior."
+            )
         credentials = {"clientId": client_id, "clientSecret": client_secret}
         response = await self.client.post(
             f"{self.api_url}/auth/access_token",
@@ -82,3 +87,8 @@ class PortAuthentication:
                 self.client_id, self.client_secret
             )
         return self.last_token_object.full_token
+
+    @staticmethod
+    def _is_personal_token(client_id: str) -> bool:
+        email_regex = r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$"
+        return re.match(email_regex, client_id) is not None

port_ocean/clients/port/mixins/entities.py

@@ -48,6 +48,7 @@ class EntityClientMixin:
                     ).lower(),
                     "validation_only": str(validation_only).lower(),
                 },
+                extensions={"retryable": True},
             )
 
         if response.is_error:
@@ -205,7 +206,6 @@ class EntityClientMixin:
                 "include": ["blueprint", "identifier"],
             },
             extensions={"retryable": True},
-            timeout=30,
         )
         handle_status_code(response)
         return [Entity.parse_obj(result) for result in response.json()["entities"]]

port_ocean/helpers/retry.py

@@ -134,7 +134,7 @@ class RetryTransport(httpx.AsyncBaseTransport, httpx.BaseTransport):
         """
         try:
             transport: httpx.BaseTransport = self._wrapped_transport  # type: ignore
-            if request.method in self._retryable_methods:
+            if self._is_retryable_method(request):
                 send_method = partial(transport.handle_request)
                 response = self._retry_operation(request, send_method)
             else:

port_ocean/tests/helpers/fake_port_api.py

@@ -0,0 +1,191 @@
+import uvicorn
+import os
+from typing import Dict, Any
+from fastapi import FastAPI, Request
+
+SMOKE_TEST_SUFFIX = os.environ.get("SMOKE_TEST_SUFFIX", "smoke")
+
+app = FastAPI()
+
+FAKE_DEPARTMENT_BLUEPRINT = {
+    "identifier": f"fake-department-{SMOKE_TEST_SUFFIX}",
+    "title": "Fake Department",
+    "icon": "Blueprint",
+    "schema": {"properties": {"name": {"type": "string"}, "id": {"type": "string"}}},
+    "relations": {},
+}
+FAKE_PERSON_BLUEPRINT = {
+    "identifier": f"fake-person-{SMOKE_TEST_SUFFIX}",
+    "title": "Fake Person",
+    "icon": "Blueprint",
+    "schema": {
+        "properties": {
+            "status": {
+                "type": "string",
+                "enum": ["WORKING", "NOPE"],
+                "enumColors": {"WORKING": "green", "NOPE": "red"},
+                "title": "Status",
+            },
+            "email": {"type": "string", "format": "email", "title": "Email"},
+            "age": {"type": "number", "title": "Age"},
+            "bio": {"type": "string", "title": "Bio"},
+        }
+    },
+    "relations": {
+        "department": {
+            "title": "Department",
+            "description": "Fake Department",
+            "target": f"fake-department-{SMOKE_TEST_SUFFIX}",
+            "required": False,
+            "many": False,
+        }
+    },
+}
+
+
+@app.router.get("/v1/blueprints/{blueprint_id}")
+@app.router.patch("/v1/blueprints/{blueprint_id}")
+async def get_blueprint(blueprint_id: str) -> Dict[str, Any]:
+    return {
+        "blueprint": (
+            FAKE_PERSON_BLUEPRINT
+            if blueprint_id.startswith("fake-person")
+            else FAKE_DEPARTMENT_BLUEPRINT
+        )
+    }
+
+
+@app.router.post("/v1/entities/search")
+async def search_entities() -> Dict[str, Any]:
+    return {"ok": True, "entities": []}
+
+
+@app.router.get("/v1/integration/{integration_id}")
+@app.router.patch("/v1/integration/{integration_id}")
+@app.router.patch("/v1/integration/{integration_id}/resync-state")
+async def get_integration(integration_id: str) -> Dict[str, Any]:
+    return {
+        "integration": {
+            "identifer": integration_id,
+            "resyncState": {
+                "status": "completed",
+                "lastResyncEnd": "2024-11-20T12:01:54.225362+00:00",
+                "lastResyncStart": "2024-11-20T12:01:45.483844+00:00",
+                "nextResync": None,
+                "intervalInMinuets": None,
+                "updatedAt": "2024-11-20T12:01:54.355Z",
+            },
+            "config": {
+                "deleteDependentEntities": True,
+                "createMissingRelatedEntities": True,
+                "enableMergeEntity": True,
+                "resources": [
+                    {
+                        "kind": "fake-department",
+                        "selector": {"query": "true"},
+                        "port": {
+                            "entity": {
+                                "mappings": {
+                                    "identifier": ".id",
+                                    "title": ".name",
+                                    "blueprint": f'"fake-department-{SMOKE_TEST_SUFFIX}"',
+                                    "properties": {"name": ".name", "id": ".id"},
+                                }
+                            }
+                        },
+                    },
+                    {
+                        "kind": "fake-person",
+                        "selector": {"query": "true"},
+                        "port": {
+                            "entity": {
+                                "mappings": {
+                                    "identifier": ".id",
+                                    "title": ".name",
+                                    "blueprint": f'"fake-person-{SMOKE_TEST_SUFFIX}"',
+                                    "properties": {
+                                        "name": ".name",
+                                        "email": ".email",
+                                        "status": ".status",
+                                        "age": ".age",
+                                        "department": ".department.name",
+                                    },
+                                    "relations": {"department": ".department.id"},
+                                }
+                            }
+                        },
+                    },
+                ],
+            },
+            "installationType": "OnPrem",
+            "_orgId": "org_ZOMGMYUNIQUEID",
+            "_id": "integration_0dOOhnlJQDjMPnfe",
+            "identifier": f"smoke-test-integration-{SMOKE_TEST_SUFFIX}",
+            "integrationType": "smoke-test",
+            "createdBy": "APSQAYsYoIwPXqjn6XpwCAgnPakkNO67",
+            "updatedBy": "APSQAYsYoIwPXqjn6XpwCAgnPakkNO67",
+            "createdAt": "2024-11-20T12:01:42.651Z",
+            "updatedAt": "2024-11-20T12:01:54.355Z",
+            "clientId": "",
+            "logAttributes": {
+                "ingestId": "DOHSAIDHOMER",
+                "ingestUrl": "http://localhost:5555/logs/integration/DOHSAIDHOMER",
+            },
+        },
+    }
+
+
+@app.router.post("/v1/blueprints/{blueprint_id}/entities")
+async def upsert_entities(blueprint_id: str, request: Request) -> Dict[str, Any]:
+    json = await request.json()
+
+    return {
+        "ok": True,
+        "entity": json,
+    }
+
+
+@app.router.post("/v1/auth/access_token")
+async def auth_token() -> Dict[str, Any]:
+    return {
+        "accessToken": "ZOMG",
+        "expiresIn": 1232131231,
+        "tokenType": "adadad",
+    }
+
+
+@app.router.delete("/v1/blueprints/{blueprint_id}/all-entities")
+async def delete_blueprint(blueprint_id: str, request: Request) -> Dict[str, Any]:
+    return {"migrationId": "ZOMG"}
+
+
+@app.router.get("/v1/migrations/{migration_id}")
+async def migration(migration_id: str, request: Request) -> Dict[str, Any]:
+    return {
+        "migration": {
+            "id": migration_id,
+            "status": "COMPLETE",
+            "actor": "Dwayne Scissors Johnson",
+            "sourceBlueprint": "leBlue",
+            "mapping": {},
+        }
+    }
+
+
+CATCH_ALL = "/{full_path:path}"
+
+
+@app.router.get(CATCH_ALL)
+@app.router.post(CATCH_ALL)
+@app.router.patch(CATCH_ALL)
+@app.router.delete(CATCH_ALL)
+async def catch_all(full_path: str, request: Request) -> str:
+    return f"Hello there from fake Port API - {full_path}, thanks for accessing me with {request.method}"
+
+
+def start() -> None:
+    uvicorn.run(app, host="0.0.0.0", port=5555)
+
+
+if __name__ == "__main__":
+    start()

port_ocean/tests/log/test_handlers.py

@@ -50,7 +50,7 @@ def test_serialize_record_exc_info_group_exception() -> None:
 
 def assert_extra(extra: dict[str, Any]) -> str:
     exc_info = extra.get("exc_info", None)
-    assert type(exc_info) is str
+    assert isinstance(exc_info, str)
     return exc_info
 
 

{port_ocean-0.14.5.dist-info → port_ocean-0.14.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.14.5
+Version: 0.14.7
 Summary: Port Ocean is a CLI tool for managing your Port projects.
 Home-page: https://app.getport.io
 Keywords: ocean,port-ocean,port

{port_ocean-0.14.5.dist-info → port_ocean-0.14.7.dist-info}/RECORD

@@ -45,11 +45,11 @@ port_ocean/cli/cookiecutter/{{cookiecutter.integration_slug}}/tests/test_sample.
 port_ocean/cli/utils.py,sha256=IUK2UbWqjci-lrcDdynZXqVP5B5TcjF0w5CpEVUks-k,54
 port_ocean/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-port_ocean/clients/port/authentication.py,sha256=t3z6h4vld-Tzkpth15sstaMJg0rccX-pXXjNtOa-nCY,2949
+port_ocean/clients/port/authentication.py,sha256=6-uDMWsJ0xLe1-9IoYXHWmwtufj8rJR4BCRXJlSkCSQ,3447
 port_ocean/clients/port/client.py,sha256=Xd8Jk25Uh4WXY_WW-z1Qbv6F3ZTBFPoOolsxHMfozKw,3366
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=POBl4uDocrgJBw4rvCAzwRcD4jk-uBL6pDAuKMTajdg,4633
-port_ocean/clients/port/mixins/entities.py,sha256=WdqT1gyS81pByUl9xIfZz_xEHRaBfDuZ-ekKX53oBSE,8870
+port_ocean/clients/port/mixins/entities.py,sha256=CnSU3dw1RTZUWYBTLP3KP7CyMweNcoDi1OlSWBwjXWU,8894
 port_ocean/clients/port/mixins/integrations.py,sha256=t8OSa7Iopnpp8IOEcp3a7WgwOcJEBdFow9UbGDKWxKI,4858
 port_ocean/clients/port/mixins/migrations.py,sha256=A6896oJF6WbFL2WroyTkMzr12yhVyWqGoq9dtLNSKBY,1457
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
@@ -115,7 +115,7 @@ port_ocean/exceptions/port_defaults.py,sha256=45Bno5JEB-GXztvKsy8mw7TrydQmw13-4J
 port_ocean/exceptions/utils.py,sha256=gjOqpi-HpY1l4WlMFsGA9yzhxDhajhoGGdDDyGbLnqI,197
 port_ocean/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/helpers/async_client.py,sha256=SRlP6o7_FCSY3UHnRlZdezppePVxxOzZ0z861vE3K40,1783
-port_ocean/helpers/retry.py,sha256=WO4yDFUd9NexZ0kESqxeTxBxNabU7_utKzgTj2-kMaM,15632
+port_ocean/helpers/retry.py,sha256=fmvaUFLIW6PICgYH4RI5rrKBXDxCAhR1Gtl0dsb2kMs,15625
 port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/log/handlers.py,sha256=ncVjgqrZRh6BhyRrA6DQG86Wsbxph1yWYuEC0cWfe-Q,3631
 port_ocean/log/logger_setup.py,sha256=CoEDowe5OwNOL_5clU6Z4faktfh0VWaOTS0VLmyhHjw,2404
@@ -131,12 +131,13 @@ port_ocean/tests/conftest.py,sha256=JXASSS0IY0nnR6bxBflhzxS25kf4iNaABmThyZ0mZt8,
 port_ocean/tests/core/defaults/test_common.py,sha256=sR7RqB3ZYV6Xn6NIg-c8k5K6JcGsYZ2SCe_PYX5vLYM,5560
 port_ocean/tests/core/handlers/entity_processor/test_jq_entity_processor.py,sha256=Yv03P-LDcJCKZ21exiTFrcT1eu0zn6Z954dilxrb52Y,10842
 port_ocean/tests/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+port_ocean/tests/helpers/fake_port_api.py,sha256=9rtjC6iTQMfzWK6WipkDzzG0b1IIaRmvdJLOyV613vE,6479
 port_ocean/tests/helpers/fixtures.py,sha256=IQEplbHhRgjrAsZlnXrgSYA5YQEn25I9HgO3_Fjibxg,1481
 port_ocean/tests/helpers/integration.py,sha256=_RxS-RHpu11lrbhUXYPZp862HLWx8AoD7iZM6iXN8rs,1104
 port_ocean/tests/helpers/ocean_app.py,sha256=8BysIhNqtTwhjnya5rr0AtrjulfJnJJMFz5cPUxIpLk,2167
 port_ocean/tests/helpers/port_client.py,sha256=5d6GNr8vNNSOkrz1AdOhxBUKuusr_-UPDP7AVpHasQw,599
 port_ocean/tests/helpers/smoke_test.py,sha256=_9aJJFRfuGJEg2D2YQJVJRmpreS6gEPHHQq8Q01x4aQ,2697
-port_ocean/tests/log/test_handlers.py,sha256=bTOGnuj8fMIEXepwYblRvcg0FKqApCdyCBtAQZ2BlXM,2115
+port_ocean/tests/log/test_handlers.py,sha256=uxgYCEQLP9U5qf-zUN9SgWFogMbYdnBeOVzXZ7E_yFw,2119
 port_ocean/tests/test_smoke.py,sha256=uix2uIg_yOm8BHDgHw2hTFPy1fiIyxBGW3ENU_KoFlo,2557
 port_ocean/tests/utils/test_async_iterators.py,sha256=3PLk1emEXekb8LcC5GgVh3OicaX15i5WyaJT_eFnu_4,1336
 port_ocean/tests/utils/test_cache.py,sha256=GzoS8xGCBDbBcPwSDbdimsMMkRvJATrBC7UmFhdW3fw,4906
@@ -150,8 +151,8 @@ port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,32
 port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.14.5.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.14.5.dist-info/METADATA,sha256=MW3BLnPGXE2LtquS4-4M46zCiMfpuczwko2Q2of44F0,6673
-port_ocean-0.14.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.14.5.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.14.5.dist-info/RECORD,,
+port_ocean-0.14.7.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.14.7.dist-info/METADATA,sha256=zaTWtHzqHc4IW3chc9bZSQW2b21WAtepfpy2yThDbB8,6673
+port_ocean-0.14.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.14.7.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.14.7.dist-info/RECORD,,