port-ocean 0.12.2.dev8__py3-none-any.whl → 0.12.2.dev11__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of port-ocean might be problematic. Click here for more details.
- port_ocean/core/integrations/base.py +3 -2
- port_ocean/core/integrations/mixins/sync_raw.py +13 -12
- port_ocean/log/logger_setup.py +2 -2
- port_ocean/ocean.py +10 -11
- {port_ocean-0.12.2.dev8.dist-info → port_ocean-0.12.2.dev11.dist-info}/METADATA +1 -1
- {port_ocean-0.12.2.dev8.dist-info → port_ocean-0.12.2.dev11.dist-info}/RECORD +9 -9
- {port_ocean-0.12.2.dev8.dist-info → port_ocean-0.12.2.dev11.dist-info}/LICENSE.md +0 -0
- {port_ocean-0.12.2.dev8.dist-info → port_ocean-0.12.2.dev11.dist-info}/WHEEL +0 -0
- {port_ocean-0.12.2.dev8.dist-info → port_ocean-0.12.2.dev11.dist-info}/entry_points.txt +0 -0
|
@@ -77,5 +77,6 @@ class BaseIntegration(SyncRawMixin, SyncMixin):
|
|
|
77
77
|
)
|
|
78
78
|
|
|
79
79
|
logger.info("Initializing event listener")
|
|
80
|
-
event_listener = await self.event_listener_factory.create_event_listener()
|
|
81
|
-
await event_listener.start()
|
|
80
|
+
# event_listener = await self.event_listener_factory.create_event_listener()
|
|
81
|
+
# await event_listener.start()
|
|
82
|
+
|
|
@@ -139,11 +139,11 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
|
|
|
139
139
|
objects_diff = await self._calculate_raw(
|
|
140
140
|
[(resource, results)], parse_all, send_raw_data_examples_amount
|
|
141
141
|
)
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
142
|
+
modified_objects = await self.entities_state_applier.upsert(
|
|
143
|
+
objects_diff[0].entity_selector_diff.passed, user_agent_type
|
|
144
|
+
)
|
|
145
145
|
return CalculationResult(
|
|
146
|
-
objects_diff[0].entity_selector_diff._replace(passed=
|
|
146
|
+
objects_diff[0].entity_selector_diff._replace(passed=modified_objects),
|
|
147
147
|
errors=objects_diff[0].errors,
|
|
148
148
|
)
|
|
149
149
|
|
|
@@ -172,6 +172,7 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
|
|
|
172
172
|
self, resource_config: ResourceConfig, user_agent_type: UserAgentType
|
|
173
173
|
) -> tuple[list[Entity], list[Exception]]:
|
|
174
174
|
results, errors = await self._get_resource_raw_results(resource_config)
|
|
175
|
+
passed_entities = []
|
|
175
176
|
async_generators: list[ASYNC_GENERATOR_RESYNC_TYPE] = []
|
|
176
177
|
raw_results: RAW_RESULT = []
|
|
177
178
|
for result in results:
|
|
@@ -200,14 +201,14 @@ class SyncRawMixin(HandlerMixin, EventsMixin):
|
|
|
200
201
|
0, send_raw_data_examples_amount - len(passed_entities)
|
|
201
202
|
)
|
|
202
203
|
|
|
203
|
-
entities, register_errors = await self._register_resource_raw(
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
)
|
|
209
|
-
errors.extend(register_errors)
|
|
210
|
-
passed_entities.extend(entities.passed)
|
|
204
|
+
# entities, register_errors = await self._register_resource_raw(
|
|
205
|
+
# resource_config,
|
|
206
|
+
# items,
|
|
207
|
+
# user_agent_type,
|
|
208
|
+
# send_raw_data_examples_amount=send_raw_data_examples_amount,
|
|
209
|
+
# )
|
|
210
|
+
# errors.extend(register_errors)
|
|
211
|
+
# passed_entities.extend(entities.passed)
|
|
211
212
|
except* OceanAbortException as error:
|
|
212
213
|
errors.append(error)
|
|
213
214
|
|
port_ocean/log/logger_setup.py
CHANGED
|
@@ -15,8 +15,8 @@ from port_ocean.utils.signal import signal_handler
|
|
|
15
15
|
def setup_logger(level: LogLevelType, enable_http_handler: bool) -> None:
|
|
16
16
|
logger.remove()
|
|
17
17
|
_stdout_loguru_handler(level)
|
|
18
|
-
if enable_http_handler:
|
|
19
|
-
|
|
18
|
+
# if enable_http_handler:
|
|
19
|
+
# _http_loguru_handler(level)
|
|
20
20
|
|
|
21
21
|
|
|
22
22
|
def _stdout_loguru_handler(level: LogLevelType) -> None:
|
port_ocean/ocean.py
CHANGED
|
@@ -9,8 +9,6 @@ from loguru import logger
|
|
|
9
9
|
from pydantic import BaseModel
|
|
10
10
|
from starlette.types import Scope, Receive, Send
|
|
11
11
|
|
|
12
|
-
from port_ocean.core.handlers.resync_state_updater import ResyncStateUpdater
|
|
13
|
-
from port_ocean.core.models import Runtime
|
|
14
12
|
from port_ocean.clients.port.client import PortClient
|
|
15
13
|
from port_ocean.config.settings import (
|
|
16
14
|
IntegrationConfiguration,
|
|
@@ -20,13 +18,14 @@ from port_ocean.context.ocean import (
|
|
|
20
18
|
ocean,
|
|
21
19
|
initialize_port_ocean_context,
|
|
22
20
|
)
|
|
21
|
+
from port_ocean.core.handlers.resync_state_updater import ResyncStateUpdater
|
|
23
22
|
from port_ocean.core.integrations.base import BaseIntegration
|
|
23
|
+
from port_ocean.core.models import Runtime
|
|
24
24
|
from port_ocean.log.sensetive import sensitive_log_filter
|
|
25
25
|
from port_ocean.middlewares import request_handler
|
|
26
26
|
from port_ocean.utils.repeat import repeat_every
|
|
27
27
|
from port_ocean.utils.signal import signal_handler
|
|
28
28
|
from port_ocean.version import __integration_version__
|
|
29
|
-
from port_ocean.utils.misc import IntegrationStateStatus
|
|
30
29
|
|
|
31
30
|
|
|
32
31
|
class Ocean:
|
|
@@ -77,20 +76,20 @@ class Ocean:
|
|
|
77
76
|
self,
|
|
78
77
|
) -> None:
|
|
79
78
|
async def execute_resync_all() -> None:
|
|
80
|
-
await self.resync_state_updater.update_before_resync()
|
|
79
|
+
# await self.resync_state_updater.update_before_resync()
|
|
81
80
|
logger.info("Starting a new scheduled resync")
|
|
82
81
|
try:
|
|
83
82
|
await self.integration.sync_raw_all()
|
|
84
|
-
await self.resync_state_updater.update_after_resync()
|
|
83
|
+
# await self.resync_state_updater.update_after_resync()
|
|
85
84
|
except asyncio.CancelledError:
|
|
86
85
|
logger.warning(
|
|
87
86
|
"resync was cancelled by the scheduled resync, skipping state update"
|
|
88
87
|
)
|
|
89
|
-
except Exception as e:
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
88
|
+
# except Exception as e:
|
|
89
|
+
# await self.resync_state_updater.update_after_resync(
|
|
90
|
+
# IntegrationStateStatus.Failed
|
|
91
|
+
# )
|
|
92
|
+
# raise e
|
|
94
93
|
|
|
95
94
|
interval = self.config.scheduled_resync_interval
|
|
96
95
|
loop = asyncio.get_event_loop()
|
|
@@ -102,7 +101,7 @@ class Ocean:
|
|
|
102
101
|
repeated_function = repeat_every(
|
|
103
102
|
seconds=interval * 60,
|
|
104
103
|
# Not running the resync immediately because the event listener should run resync on startup
|
|
105
|
-
wait_first=
|
|
104
|
+
wait_first=False,
|
|
106
105
|
)(
|
|
107
106
|
lambda: threading.Thread(
|
|
108
107
|
target=lambda: asyncio.run_coroutine_threadsafe(
|
|
@@ -89,12 +89,12 @@ port_ocean/core/handlers/port_app_config/models.py,sha256=YvYtf_44KD_rN4xK-3xHtd
|
|
|
89
89
|
port_ocean/core/handlers/resync_state_updater/__init__.py,sha256=kG6y-JQGpPfuTHh912L_bctIDCzAK4DN-d00S7rguWU,81
|
|
90
90
|
port_ocean/core/handlers/resync_state_updater/updater.py,sha256=Yg9ET6ZV5B9GW7u6zZA6GlB_71kmvxvYX2FWgQNzMvo,3182
|
|
91
91
|
port_ocean/core/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
92
|
-
port_ocean/core/integrations/base.py,sha256=
|
|
92
|
+
port_ocean/core/integrations/base.py,sha256=3nGOgJHzzlhr1OlrebzDENDAG6tiOyJfnijWFYtPn1U,3012
|
|
93
93
|
port_ocean/core/integrations/mixins/__init__.py,sha256=FA1FEKMM6P-L2_m7Q4L20mFa4_RgZnwSRmTCreKcBVM,220
|
|
94
94
|
port_ocean/core/integrations/mixins/events.py,sha256=Ddfx2L4FpghV38waF8OfVeOV0bHBxNIgjU-q5ffillI,2341
|
|
95
95
|
port_ocean/core/integrations/mixins/handler.py,sha256=mZ7-0UlG3LcrwJttFbMe-R4xcOU2H_g33tZar7PwTv8,3771
|
|
96
96
|
port_ocean/core/integrations/mixins/sync.py,sha256=B9fEs8faaYLLikH9GBjE_E61vo0bQDjIGQsQ1SRXOlA,3931
|
|
97
|
-
port_ocean/core/integrations/mixins/sync_raw.py,sha256=
|
|
97
|
+
port_ocean/core/integrations/mixins/sync_raw.py,sha256=tZFWCPthhSaQ1x2TsBDnSN_G_WgzYVX0xE6kBvDCtHc,19000
|
|
98
98
|
port_ocean/core/integrations/mixins/utils.py,sha256=7y1rGETZIjOQadyIjFJXIHKkQFKx_SwiP-TrAIsyyLY,2303
|
|
99
99
|
port_ocean/core/models.py,sha256=dJ2_olTdbjUpObQJNmg7e7EENU_zZiX6XOaknNp54B0,1342
|
|
100
100
|
port_ocean/core/ocean_types.py,sha256=3_d8-n626f1kWLQ_Jxw194LEyrOVupz05qs_Y1pvB-A,990
|
|
@@ -112,10 +112,10 @@ port_ocean/helpers/async_client.py,sha256=SRlP6o7_FCSY3UHnRlZdezppePVxxOzZ0z861v
|
|
|
112
112
|
port_ocean/helpers/retry.py,sha256=IQ0RfQ2T5o6uoZh2WW2nrFH5TT6K_k3y2Im0HDp5j9Y,15059
|
|
113
113
|
port_ocean/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
114
114
|
port_ocean/log/handlers.py,sha256=k9G_Mb4ga2-Jke9irpdlYqj6EYiwv0gEsh4TgyqqOmI,2853
|
|
115
|
-
port_ocean/log/logger_setup.py,sha256=
|
|
115
|
+
port_ocean/log/logger_setup.py,sha256=qSeVwnivV4WoLx_4SfBwn2PtmUpNdkSEgfm0C8B3yUw,2332
|
|
116
116
|
port_ocean/log/sensetive.py,sha256=lVKiZH6b7TkrZAMmhEJRhcl67HNM94e56x12DwFgCQk,2920
|
|
117
117
|
port_ocean/middlewares.py,sha256=9wYCdyzRZGK1vjEJ28FY_DkfwDNENmXp504UKPf5NaQ,2727
|
|
118
|
-
port_ocean/ocean.py,sha256=
|
|
118
|
+
port_ocean/ocean.py,sha256=Xsda8kkDk-8qnzFFw08M1YS0LJpLj4PB0UpfsK9Oc2o,5029
|
|
119
119
|
port_ocean/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
120
120
|
port_ocean/run.py,sha256=rTxBlrQd4yyrtgErCFJCHCEHs7d1OXrRiJehUYmIbN0,2212
|
|
121
121
|
port_ocean/sonar-project.properties,sha256=X_wLzDOkEVmpGLRMb2fg9Rb0DxWwUFSvESId8qpvrPI,73
|
|
@@ -140,8 +140,8 @@ port_ocean/utils/repeat.py,sha256=0EFWM9d8lLXAhZmAyczY20LAnijw6UbIECf5lpGbOas,32
|
|
|
140
140
|
port_ocean/utils/signal.py,sha256=K-6kKFQTltcmKDhtyZAcn0IMa3sUpOHGOAUdWKgx0_E,1369
|
|
141
141
|
port_ocean/utils/time.py,sha256=pufAOH5ZQI7gXvOvJoQXZXZJV-Dqktoj9Qp9eiRwmJ4,1939
|
|
142
142
|
port_ocean/version.py,sha256=UsuJdvdQlazzKGD3Hd5-U7N69STh8Dq9ggJzQFnu9fU,177
|
|
143
|
-
port_ocean-0.12.2.
|
|
144
|
-
port_ocean-0.12.2.
|
|
145
|
-
port_ocean-0.12.2.
|
|
146
|
-
port_ocean-0.12.2.
|
|
147
|
-
port_ocean-0.12.2.
|
|
143
|
+
port_ocean-0.12.2.dev11.dist-info/LICENSE.md,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
|
|
144
|
+
port_ocean-0.12.2.dev11.dist-info/METADATA,sha256=o8MpM1s3NEQo7LEhAJjzA3F9Ifj8VAdOKIIDEP4GeI0,6620
|
|
145
|
+
port_ocean-0.12.2.dev11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
|
|
146
|
+
port_ocean-0.12.2.dev11.dist-info/entry_points.txt,sha256=F_DNUmGZU2Kme-8NsWM5LLE8piGMafYZygRYhOVtcjA,54
|
|
147
|
+
port_ocean-0.12.2.dev11.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|