port-ocean 0.28.9__py3-none-any.whl → 0.28.11__py3-none-any.whl

port_ocean/clients/port/mixins/integrations.py

@@ -301,7 +301,7 @@ class IntegrationClientMixin:
             headers=headers,
             json={
                 "items": raw_data,
-                "extractionTimestamp": datetime.now().isoformat(),
+                "extractionTimestamp": int(datetime.now().timestamp()),
             },
         )
         handle_port_status_code(response, should_log=False)

port_ocean/core/handlers/port_app_config/models.py

@@ -29,7 +29,9 @@ class EntityMapping(BaseModel):
 
     @property
     def is_using_search_identifier(self) -> bool:
-        return isinstance(self.identifier, dict)
+        return isinstance(self.identifier, dict) or isinstance(
+            self.identifier, IngestSearchQuery
+        )
 
 
 class MappingsConfig(BaseModel):

port_ocean/core/utils/utils.py

@@ -4,7 +4,7 @@ import json
 from typing import Iterable, Any, TypeVar, Callable, Awaitable
 
 from loguru import logger
-from pydantic import parse_obj_as, ValidationError
+from pydantic import BaseModel, parse_obj_as, ValidationError
 
 
 from port_ocean.clients.port.client import PortClient
@@ -79,6 +79,19 @@ async def gather_and_split_errors_from_results(
     return valid_items, errors
 
 
+def _get_entity_key(entity: Entity) -> tuple[str, str]:
+    identifier = entity.identifier
+    if isinstance(identifier, BaseModel):
+        identifier = identifier.dict()
+
+    key_part = (
+        json.dumps(identifier, sort_keys=True)
+        if isinstance(identifier, dict)
+        else str(identifier)
+    )
+    return key_part, entity.blueprint
+
+
 def get_port_diff(before: Iterable[Entity], after: Iterable[Entity]) -> EntityPortDiff:
     before_dict = {}
     after_dict = {}
@@ -88,12 +101,10 @@ def get_port_diff(before: Iterable[Entity], after: Iterable[Entity]) -> EntityPo
 
     # Create dictionaries for before and after lists
     for entity in before:
-        key = (entity.identifier, entity.blueprint)
-        before_dict[key] = entity
+        before_dict[_get_entity_key(entity)] = entity
 
     for entity in after:
-        key = (entity.identifier, entity.blueprint)
-        after_dict[key] = entity
+        after_dict[_get_entity_key(entity)] = entity
 
     # Find created, modified, and deleted objects
     for key, obj in after_dict.items():

port_ocean/tests/core/utils/test_get_port_diff.py

@@ -0,0 +1,164 @@
+from typing import Any
+
+from port_ocean.core.models import Entity
+from port_ocean.core.utils.utils import get_port_diff
+
+
+def create_test_entity(
+    identifier: str,
+    blueprint: str,
+    properties: dict[str, Any],
+    relations: dict[str, Any],
+    title: Any,
+    team: str | None | list[Any] = [],
+) -> Entity:
+    return Entity(
+        identifier=identifier,
+        blueprint=blueprint,
+        properties=properties,
+        relations=relations,
+        title=title,
+        team=team,
+    )
+
+
+entity1 = create_test_entity(
+    "id1",
+    "bp1",
+    {"totalIssues": 123, "url": "https://test.atlassian.net/browse/test-29081"},
+    {"reporter": "id1", "project": "project_id"},
+    "",
+    "",
+)
+entity1_modified_properties = create_test_entity(
+    "id1",
+    "bp1",
+    {"totalIssues": 5, "url": "https://test.atlassian.net/browse/test-29081"},
+    {"reporter": "id1", "project": "project_id"},
+    "",
+    "",
+)
+entity2 = create_test_entity(
+    "id2",
+    "bp2",
+    {"totalIssues": 234, "url": "https://test.atlassian.net/browse/test-23451"},
+    {"reporter": "id2", "project": "project_id2"},
+    "",
+    "",
+)
+entity3 = create_test_entity(
+    "id3",
+    "bp3",
+    {"totalIssues": 20, "url": "https://test.atlassian.net/browse/test-542"},
+    {"reporter": "id3", "project": "project_id3"},
+    "",
+    "",
+)
+
+
+def test_get_port_diff_with_dictionary_identifier() -> None:
+    """
+    Test that get_port_diff handles dictionary identifiers by converting them to strings.
+    An entity with a dictionary identifier in 'before' and not in 'after' should be marked as deleted.
+    """
+    entity_with_dict_id = create_test_entity(
+        identifier={"rules": "some_id", "combinator": "some combinator"},  # type: ignore
+        blueprint="bp1",
+        properties={},
+        relations={},
+        title="test",
+    )
+    before = [entity_with_dict_id]
+    after: list[Entity] = []
+
+    diff = get_port_diff(before, after)
+
+    assert not diff.created
+    assert not diff.modified
+    assert len(diff.deleted) == 1
+    assert entity_with_dict_id in diff.deleted
+
+
+def test_get_port_diff_no_changes() -> None:
+    """
+    Test get_port_diff with no changes between before and after.
+    Entities present in both should be in the 'modified' list.
+    """
+    before = [entity1, entity2]
+    after = [entity1, entity2]
+
+    diff = get_port_diff(before, after)
+
+    assert not diff.created
+    assert not diff.deleted
+    assert len(diff.modified) == 2
+    assert entity1 in diff.modified
+    assert entity2 in diff.modified
+
+
+def test_get_port_diff_created_entities() -> None:
+    """
+    Test get_port_diff with only new entities.
+    """
+    before: list[Entity] = []
+    after = [entity1, entity2]
+
+    diff = get_port_diff(before, after)
+
+    assert not diff.modified
+    assert not diff.deleted
+    assert len(diff.created) == 2
+    assert entity1 in diff.created
+    assert entity2 in diff.created
+
+
+def test_get_port_diff_deleted_entities() -> None:
+    """
+    Test get_port_diff with only deleted entities.
+    """
+    before = [entity1, entity2]
+    after: list[Entity] = []
+
+    diff = get_port_diff(before, after)
+
+    assert not diff.created
+    assert not diff.modified
+    assert len(diff.deleted) == 2
+    assert entity1 in diff.deleted
+    assert entity2 in diff.deleted
+
+
+def test_get_port_diff_modified_entities() -> None:
+    """
+    Test get_port_diff with modified entities.
+    Entities with same identifier and blueprint are considered modified.
+    """
+    before = [entity1, entity2]
+    after = [entity1_modified_properties, entity2]
+
+    diff = get_port_diff(before, after)
+
+    assert not diff.created
+    assert not diff.deleted
+    assert len(diff.modified) == 2
+    assert entity1_modified_properties in diff.modified
+    assert entity2 in diff.modified
+
+
+def test_get_port_diff_mixed_changes() -> None:
+    """
+    Test get_port_diff with a mix of created, modified, and deleted entities.
+    """
+    before = [entity1, entity2]
+    after = [entity1_modified_properties, entity3]
+
+    diff = get_port_diff(before, after)
+
+    assert len(diff.created) == 1
+    assert entity3 in diff.created
+
+    assert len(diff.modified) == 1
+    assert entity1_modified_properties in diff.modified
+
+    assert len(diff.deleted) == 1
+    assert entity2 in diff.deleted

{port_ocean-0.28.9.dist-info → port_ocean-0.28.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: port-ocean
-Version: 0.28.9
+Version: 0.28.11
 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.28.9.dist-info → port_ocean-0.28.11.dist-info}/RECORD

@@ -61,7 +61,7 @@ port_ocean/clients/port/client.py,sha256=hBXgU0CDseN2F-vn20JqowfVkcd6oSVmYrjn6t4
 port_ocean/clients/port/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/clients/port/mixins/blueprints.py,sha256=aMCG4zePsMSMjMLiGrU37h5z5_ElfMzTcTvqvOI5wXY,4683
 port_ocean/clients/port/mixins/entities.py,sha256=X2NqH00eK6TMJ3a3QEQRVQlKHzyj5l1FiPkIhonnbPg,24234
-port_ocean/clients/port/mixins/integrations.py,sha256=16RGnrEnToSkOgffUN1Q62J81Oo_8acvw-cxztuy5Ys,12037
+port_ocean/clients/port/mixins/integrations.py,sha256=oBkO6OtRtos7KmjS-QUnudhrxHRoNOmaClVNnc1_EHU,12042
 port_ocean/clients/port/mixins/migrations.py,sha256=vdL_A_NNUogvzujyaRLIoZEu5vmKDY2BxTjoGP94YzI,1467
 port_ocean/clients/port/mixins/organization.py,sha256=A2cP5V49KnjoAXxjmnm_XGth4ftPSU0qURNfnyUyS_Y,1041
 port_ocean/clients/port/retry_transport.py,sha256=PtIZOAZ6V-ncpVysRUsPOgt8Sf01QLnTKB5YeKBxkJk,1861
@@ -105,7 +105,7 @@ port_ocean/core/handlers/entity_processor/jq_entity_processor.py,sha256=qvPMbIH1
 port_ocean/core/handlers/port_app_config/__init__.py,sha256=8AAT5OthiVM7KCcM34iEgEeXtn2pRMrT4Dze5r1Ixbk,134
 port_ocean/core/handlers/port_app_config/api.py,sha256=r_Th66NEw38IpRdnXZcRvI8ACfvxW_A6V62WLwjWXlQ,1044
 port_ocean/core/handlers/port_app_config/base.py,sha256=Sup4-X_a7JGa27rMy_OgqGIjFHMlKBpKevicaK3AeHU,2919
-port_ocean/core/handlers/port_app_config/models.py,sha256=M9NJRRacvpZQYCFgHGlRwrdgumbIIJ82WpCyvtOUf5w,3019
+port_ocean/core/handlers/port_app_config/models.py,sha256=J-dfd9fEcTA77zJKL_Qd3bvg-v3B_-vZe06Mo-V5ptE,3091
 port_ocean/core/handlers/queue/__init__.py,sha256=yzgicE_jAR1wtljFKxgyG6j-HbLcG_Zze5qw1kkALUI,171
 port_ocean/core/handlers/queue/abstract_queue.py,sha256=SaivrYbqg8qsX6wtQlJZyxgcbdMD5B9NZG3byN9AvrI,782
 port_ocean/core/handlers/queue/group_queue.py,sha256=JvvJOwz9z_aI4CjPr7yQX-0rOgqLI5wMdxWk2x5x-34,4989
@@ -128,7 +128,7 @@ port_ocean/core/integrations/mixins/utils.py,sha256=ytnFX7Lyv6N3CgBnOXxYaI1cRDq5
 port_ocean/core/models.py,sha256=DNbKpStMINI2lIekKprTqBevqkw_wFuFayN19w1aDfQ,2893
 port_ocean/core/ocean_types.py,sha256=bkLlTd8XfJK6_JDl0eXUHfE_NygqgiInSMwJ4YJH01Q,1399
 port_ocean/core/utils/entity_topological_sorter.py,sha256=MDUjM6OuDy4Xj68o-7InNN0w1jqjxeDfeY8U02vySNI,3081
-port_ocean/core/utils/utils.py,sha256=XJ6ZZBR5hols19TcX4Bh49ygSNhPt3MLncLR-g41GTA,6858
+port_ocean/core/utils/utils.py,sha256=6ySxua6JgVxcjESPL5MScdkpaUj5XR9srorGHHb0B2o,7157
 port_ocean/debug_cli.py,sha256=gHrv-Ey3cImKOcGZpjoHlo4pa_zfmyOl6TUM4o9VtcA,96
 port_ocean/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/exceptions/api.py,sha256=1JcA-H12lhSgolMEA6dM4JMbDrh9sYDcE7oydPSTuK8,649
@@ -182,6 +182,7 @@ port_ocean/tests/core/handlers/webhook/test_processor_manager.py,sha256=16q-5Nag
 port_ocean/tests/core/handlers/webhook/test_webhook_event.py,sha256=oR4dEHLO65mp6rkfNfszZcfFoRZlB8ZWee4XetmsuIk,3181
 port_ocean/tests/core/test_utils.py,sha256=Z3kdhb5V7Svhcyy3EansdTpgHL36TL6erNtU-OPwAcI,2647
 port_ocean/tests/core/utils/test_entity_topological_sorter.py,sha256=zuq5WSPy_88PemG3mOUIHTxWMR_js1R7tOzUYlgBd68,3447
+port_ocean/tests/core/utils/test_get_port_diff.py,sha256=YoQxAHZdX5nVpvrKV5Aox-jQ4w14AbfJVo-QK-ICAb8,4297
 port_ocean/tests/core/utils/test_resolve_entities_diff.py,sha256=nSB0H87Gk6iFw7RMq9YfiZtC_u6X20ao5vmvywP5HsE,17945
 port_ocean/tests/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 port_ocean/tests/helpers/fake_port_api.py,sha256=9rtjC6iTQMfzWK6WipkDzzG0b1IIaRmvdJLOyV613vE,6479
@@ -208,8 +209,8 @@ port_ocean/utils/repeat.py,sha256=U2OeCkHPWXmRTVoPV-VcJRlQhcYqPWI5NfmPlb1JIbc,32
 port_ocean/utils/signal.py,sha256=J1sI-e_32VHP_VUa5bskLMFoJjJOAk5isrnewKDikUI,2125
 port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
 port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
-port_ocean-0.28.9.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-port_ocean-0.28.9.dist-info/METADATA,sha256=gd8ZvFlVK5p1ypLtnTiCIJwvdoMtXm4Tli18ebscTjs,7015
-port_ocean-0.28.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-port_ocean-0.28.9.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
-port_ocean-0.28.9.dist-info/RECORD,,
+port_ocean-0.28.11.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+port_ocean-0.28.11.dist-info/METADATA,sha256=_DEW9DiFQmGDhG8llM9ln0bH4Bmg_rurx0SQ_FQSMPI,7016
+port_ocean-0.28.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+port_ocean-0.28.11.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
+port_ocean-0.28.11.dist-info/RECORD,,