airbyte-agent-hubspot 0.15.28__py3-none-any.whl → 0.15.43__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.
- airbyte_agent_hubspot/__init__.py +101 -26
- airbyte_agent_hubspot/_vendored/connector_sdk/auth_strategies.py +2 -5
- airbyte_agent_hubspot/_vendored/connector_sdk/auth_template.py +1 -1
- airbyte_agent_hubspot/_vendored/connector_sdk/cloud_utils/client.py +26 -26
- airbyte_agent_hubspot/_vendored/connector_sdk/connector_model_loader.py +11 -4
- airbyte_agent_hubspot/_vendored/connector_sdk/constants.py +1 -1
- airbyte_agent_hubspot/_vendored/connector_sdk/executor/hosted_executor.py +10 -11
- airbyte_agent_hubspot/_vendored/connector_sdk/executor/local_executor.py +126 -17
- airbyte_agent_hubspot/_vendored/connector_sdk/extensions.py +43 -5
- airbyte_agent_hubspot/_vendored/connector_sdk/http/response.py +2 -0
- airbyte_agent_hubspot/_vendored/connector_sdk/introspection.py +262 -0
- airbyte_agent_hubspot/_vendored/connector_sdk/logging/logger.py +9 -9
- airbyte_agent_hubspot/_vendored/connector_sdk/logging/types.py +10 -10
- airbyte_agent_hubspot/_vendored/connector_sdk/observability/config.py +179 -0
- airbyte_agent_hubspot/_vendored/connector_sdk/observability/models.py +6 -6
- airbyte_agent_hubspot/_vendored/connector_sdk/observability/session.py +41 -32
- airbyte_agent_hubspot/_vendored/connector_sdk/performance/metrics.py +3 -3
- airbyte_agent_hubspot/_vendored/connector_sdk/schema/base.py +20 -18
- airbyte_agent_hubspot/_vendored/connector_sdk/schema/components.py +59 -58
- airbyte_agent_hubspot/_vendored/connector_sdk/schema/connector.py +22 -33
- airbyte_agent_hubspot/_vendored/connector_sdk/schema/extensions.py +103 -10
- airbyte_agent_hubspot/_vendored/connector_sdk/schema/operations.py +32 -32
- airbyte_agent_hubspot/_vendored/connector_sdk/schema/security.py +44 -34
- airbyte_agent_hubspot/_vendored/connector_sdk/secrets.py +2 -2
- airbyte_agent_hubspot/_vendored/connector_sdk/telemetry/events.py +9 -8
- airbyte_agent_hubspot/_vendored/connector_sdk/telemetry/tracker.py +9 -5
- airbyte_agent_hubspot/_vendored/connector_sdk/types.py +7 -3
- airbyte_agent_hubspot/connector.py +182 -87
- airbyte_agent_hubspot/connector_model.py +17 -12
- airbyte_agent_hubspot/models.py +28 -28
- airbyte_agent_hubspot/types.py +45 -45
- {airbyte_agent_hubspot-0.15.28.dist-info → airbyte_agent_hubspot-0.15.43.dist-info}/METADATA +16 -17
- {airbyte_agent_hubspot-0.15.28.dist-info → airbyte_agent_hubspot-0.15.43.dist-info}/RECORD +34 -32
- {airbyte_agent_hubspot-0.15.28.dist-info → airbyte_agent_hubspot-0.15.43.dist-info}/WHEEL +0 -0
|
@@ -22,65 +22,140 @@ from .models import (
|
|
|
22
22
|
Ticket,
|
|
23
23
|
TicketsList,
|
|
24
24
|
SchemaAssociationsItem,
|
|
25
|
+
SchemaLabels,
|
|
25
26
|
SchemaPropertiesItemModificationmetadata,
|
|
26
27
|
SchemaPropertiesItem,
|
|
27
|
-
SchemaLabels,
|
|
28
28
|
Schema,
|
|
29
29
|
SchemasList,
|
|
30
30
|
CRMObjectProperties,
|
|
31
31
|
CRMObject,
|
|
32
32
|
ObjectsList,
|
|
33
33
|
ContactsListResultMeta,
|
|
34
|
-
|
|
34
|
+
ContactsApiSearchResultMeta,
|
|
35
35
|
CompaniesListResultMeta,
|
|
36
|
-
|
|
36
|
+
CompaniesApiSearchResultMeta,
|
|
37
37
|
DealsListResultMeta,
|
|
38
|
-
|
|
38
|
+
DealsApiSearchResultMeta,
|
|
39
39
|
TicketsListResultMeta,
|
|
40
|
-
|
|
40
|
+
TicketsApiSearchResultMeta,
|
|
41
41
|
ObjectsListResultMeta,
|
|
42
42
|
HubspotExecuteResult,
|
|
43
43
|
HubspotExecuteResultWithMeta,
|
|
44
44
|
ContactsListResult,
|
|
45
|
-
|
|
45
|
+
ContactsApiSearchResult,
|
|
46
46
|
CompaniesListResult,
|
|
47
|
-
|
|
47
|
+
CompaniesApiSearchResult,
|
|
48
48
|
DealsListResult,
|
|
49
|
-
|
|
49
|
+
DealsApiSearchResult,
|
|
50
50
|
TicketsListResult,
|
|
51
|
-
|
|
51
|
+
TicketsApiSearchResult,
|
|
52
52
|
SchemasListResult,
|
|
53
53
|
ObjectsListResult
|
|
54
54
|
)
|
|
55
55
|
from .types import (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
56
|
+
ContactsApiSearchParamsFiltergroupsItemFiltersItem,
|
|
57
|
+
ContactsApiSearchParamsFiltergroupsItem,
|
|
58
|
+
ContactsApiSearchParamsSortsItem,
|
|
59
|
+
CompaniesApiSearchParamsFiltergroupsItemFiltersItem,
|
|
60
|
+
CompaniesApiSearchParamsFiltergroupsItem,
|
|
61
|
+
CompaniesApiSearchParamsSortsItem,
|
|
62
|
+
DealsApiSearchParamsFiltergroupsItemFiltersItem,
|
|
63
|
+
DealsApiSearchParamsFiltergroupsItem,
|
|
64
|
+
DealsApiSearchParamsSortsItem,
|
|
65
|
+
TicketsApiSearchParamsFiltergroupsItemFiltersItem,
|
|
66
|
+
TicketsApiSearchParamsFiltergroupsItem,
|
|
67
|
+
TicketsApiSearchParamsSortsItem,
|
|
68
68
|
ContactsListParams,
|
|
69
69
|
ContactsGetParams,
|
|
70
|
-
|
|
70
|
+
ContactsApiSearchParams,
|
|
71
71
|
CompaniesListParams,
|
|
72
72
|
CompaniesGetParams,
|
|
73
|
-
|
|
73
|
+
CompaniesApiSearchParams,
|
|
74
74
|
DealsListParams,
|
|
75
75
|
DealsGetParams,
|
|
76
|
-
|
|
76
|
+
DealsApiSearchParams,
|
|
77
77
|
TicketsListParams,
|
|
78
78
|
TicketsGetParams,
|
|
79
|
-
|
|
79
|
+
TicketsApiSearchParams,
|
|
80
80
|
SchemasListParams,
|
|
81
81
|
SchemasGetParams,
|
|
82
82
|
ObjectsListParams,
|
|
83
83
|
ObjectsGetParams
|
|
84
84
|
)
|
|
85
85
|
|
|
86
|
-
__all__ = [
|
|
86
|
+
__all__ = [
|
|
87
|
+
"HubspotConnector",
|
|
88
|
+
"HubspotAuthConfig",
|
|
89
|
+
"ContactProperties",
|
|
90
|
+
"Contact",
|
|
91
|
+
"PagingNext",
|
|
92
|
+
"Paging",
|
|
93
|
+
"ContactsList",
|
|
94
|
+
"CompanyProperties",
|
|
95
|
+
"Company",
|
|
96
|
+
"CompaniesList",
|
|
97
|
+
"DealProperties",
|
|
98
|
+
"Deal",
|
|
99
|
+
"DealsList",
|
|
100
|
+
"TicketProperties",
|
|
101
|
+
"Ticket",
|
|
102
|
+
"TicketsList",
|
|
103
|
+
"SchemaAssociationsItem",
|
|
104
|
+
"SchemaLabels",
|
|
105
|
+
"SchemaPropertiesItemModificationmetadata",
|
|
106
|
+
"SchemaPropertiesItem",
|
|
107
|
+
"Schema",
|
|
108
|
+
"SchemasList",
|
|
109
|
+
"CRMObjectProperties",
|
|
110
|
+
"CRMObject",
|
|
111
|
+
"ObjectsList",
|
|
112
|
+
"ContactsListResultMeta",
|
|
113
|
+
"ContactsApiSearchResultMeta",
|
|
114
|
+
"CompaniesListResultMeta",
|
|
115
|
+
"CompaniesApiSearchResultMeta",
|
|
116
|
+
"DealsListResultMeta",
|
|
117
|
+
"DealsApiSearchResultMeta",
|
|
118
|
+
"TicketsListResultMeta",
|
|
119
|
+
"TicketsApiSearchResultMeta",
|
|
120
|
+
"ObjectsListResultMeta",
|
|
121
|
+
"HubspotExecuteResult",
|
|
122
|
+
"HubspotExecuteResultWithMeta",
|
|
123
|
+
"ContactsListResult",
|
|
124
|
+
"ContactsApiSearchResult",
|
|
125
|
+
"CompaniesListResult",
|
|
126
|
+
"CompaniesApiSearchResult",
|
|
127
|
+
"DealsListResult",
|
|
128
|
+
"DealsApiSearchResult",
|
|
129
|
+
"TicketsListResult",
|
|
130
|
+
"TicketsApiSearchResult",
|
|
131
|
+
"SchemasListResult",
|
|
132
|
+
"ObjectsListResult",
|
|
133
|
+
"ContactsApiSearchParamsFiltergroupsItemFiltersItem",
|
|
134
|
+
"ContactsApiSearchParamsFiltergroupsItem",
|
|
135
|
+
"ContactsApiSearchParamsSortsItem",
|
|
136
|
+
"CompaniesApiSearchParamsFiltergroupsItemFiltersItem",
|
|
137
|
+
"CompaniesApiSearchParamsFiltergroupsItem",
|
|
138
|
+
"CompaniesApiSearchParamsSortsItem",
|
|
139
|
+
"DealsApiSearchParamsFiltergroupsItemFiltersItem",
|
|
140
|
+
"DealsApiSearchParamsFiltergroupsItem",
|
|
141
|
+
"DealsApiSearchParamsSortsItem",
|
|
142
|
+
"TicketsApiSearchParamsFiltergroupsItemFiltersItem",
|
|
143
|
+
"TicketsApiSearchParamsFiltergroupsItem",
|
|
144
|
+
"TicketsApiSearchParamsSortsItem",
|
|
145
|
+
"ContactsListParams",
|
|
146
|
+
"ContactsGetParams",
|
|
147
|
+
"ContactsApiSearchParams",
|
|
148
|
+
"CompaniesListParams",
|
|
149
|
+
"CompaniesGetParams",
|
|
150
|
+
"CompaniesApiSearchParams",
|
|
151
|
+
"DealsListParams",
|
|
152
|
+
"DealsGetParams",
|
|
153
|
+
"DealsApiSearchParams",
|
|
154
|
+
"TicketsListParams",
|
|
155
|
+
"TicketsGetParams",
|
|
156
|
+
"TicketsApiSearchParams",
|
|
157
|
+
"SchemasListParams",
|
|
158
|
+
"SchemasGetParams",
|
|
159
|
+
"ObjectsListParams",
|
|
160
|
+
"ObjectsGetParams",
|
|
161
|
+
]
|
|
@@ -610,9 +610,7 @@ class OAuth2AuthStrategy(AuthStrategy):
|
|
|
610
610
|
has_refresh_token = bool(secrets.get("refresh_token"))
|
|
611
611
|
|
|
612
612
|
if not has_access_token and not has_refresh_token:
|
|
613
|
-
raise AuthenticationError(
|
|
614
|
-
"Missing OAuth2 credentials. Provide either 'access_token' " "or 'refresh_token' (for refresh-token-only mode)."
|
|
615
|
-
)
|
|
613
|
+
raise AuthenticationError("Missing OAuth2 credentials. Provide either 'access_token' or 'refresh_token' (for refresh-token-only mode).")
|
|
616
614
|
|
|
617
615
|
def can_refresh(self, secrets: OAuth2RefreshSecrets) -> bool:
|
|
618
616
|
"""Check if token refresh is possible.
|
|
@@ -1106,8 +1104,7 @@ class AuthStrategyFactory:
|
|
|
1106
1104
|
strategy = cls._strategies.get(auth_type)
|
|
1107
1105
|
if strategy is None:
|
|
1108
1106
|
raise AuthenticationError(
|
|
1109
|
-
f"Authentication type '{auth_type.value}' is not implemented. "
|
|
1110
|
-
f"Supported types: {', '.join(s.value for s in cls._strategies.keys())}"
|
|
1107
|
+
f"Authentication type '{auth_type.value}' is not implemented. Supported types: {', '.join(s.value for s in cls._strategies.keys())}"
|
|
1111
1108
|
)
|
|
1112
1109
|
return strategy
|
|
1113
1110
|
|
|
@@ -17,7 +17,7 @@ class MissingVariableError(ValueError):
|
|
|
17
17
|
def __init__(self, var_name: str, available_fields: list):
|
|
18
18
|
self.var_name = var_name
|
|
19
19
|
self.available_fields = available_fields
|
|
20
|
-
super().__init__(f"Template variable '${{{var_name}}}' not found in config.
|
|
20
|
+
super().__init__(f"Template variable '${{{var_name}}}' not found in config. Available fields: {available_fields}")
|
|
21
21
|
|
|
22
22
|
|
|
23
23
|
def apply_template(template: str, values: Dict[str, str]) -> str:
|
|
@@ -13,7 +13,7 @@ class AirbyteCloudClient:
|
|
|
13
13
|
|
|
14
14
|
Handles authentication, token caching, and API calls to:
|
|
15
15
|
- Get bearer tokens for authentication
|
|
16
|
-
- Look up
|
|
16
|
+
- Look up connectors for users
|
|
17
17
|
- Execute connectors via the cloud API
|
|
18
18
|
|
|
19
19
|
Example:
|
|
@@ -22,15 +22,15 @@ class AirbyteCloudClient:
|
|
|
22
22
|
client_secret="your-client-secret"
|
|
23
23
|
)
|
|
24
24
|
|
|
25
|
-
# Get a connector
|
|
26
|
-
|
|
25
|
+
# Get a connector ID
|
|
26
|
+
connector_id = await client.get_connector_id(
|
|
27
27
|
external_user_id="user-123",
|
|
28
|
-
connector_definition_id="
|
|
28
|
+
connector_definition_id="550e8400-e29b-41d4-a716-446655440000"
|
|
29
29
|
)
|
|
30
30
|
|
|
31
31
|
# Execute the connector
|
|
32
32
|
result = await client.execute_connector(
|
|
33
|
-
|
|
33
|
+
connector_id=connector_id,
|
|
34
34
|
entity="customers",
|
|
35
35
|
action="list",
|
|
36
36
|
params={"limit": 10}
|
|
@@ -105,37 +105,37 @@ class AirbyteCloudClient:
|
|
|
105
105
|
|
|
106
106
|
return access_token
|
|
107
107
|
|
|
108
|
-
async def
|
|
108
|
+
async def get_connector_id(
|
|
109
109
|
self,
|
|
110
110
|
external_user_id: str,
|
|
111
111
|
connector_definition_id: str,
|
|
112
112
|
) -> str:
|
|
113
|
-
"""Get connector
|
|
113
|
+
"""Get connector ID for a user.
|
|
114
114
|
|
|
115
|
-
Looks up the connector
|
|
116
|
-
and connector definition. Validates that exactly one
|
|
115
|
+
Looks up the connector that belongs to the specified user
|
|
116
|
+
and connector definition. Validates that exactly one connector exists.
|
|
117
117
|
|
|
118
118
|
Args:
|
|
119
119
|
external_user_id: User identifier in the Airbyte system
|
|
120
120
|
connector_definition_id: UUID of the connector definition
|
|
121
121
|
|
|
122
122
|
Returns:
|
|
123
|
-
Connector
|
|
123
|
+
Connector ID (UUID string)
|
|
124
124
|
|
|
125
125
|
Raises:
|
|
126
|
-
ValueError: If 0 or more than 1
|
|
126
|
+
ValueError: If 0 or more than 1 connector is found
|
|
127
127
|
httpx.HTTPStatusError: If API returns 4xx/5xx status code
|
|
128
128
|
httpx.RequestError: If network request fails
|
|
129
129
|
|
|
130
130
|
Example:
|
|
131
|
-
|
|
131
|
+
connector_id = await client.get_connector_id(
|
|
132
132
|
external_user_id="user-123",
|
|
133
133
|
connector_definition_id="550e8400-e29b-41d4-a716-446655440000"
|
|
134
134
|
)
|
|
135
135
|
"""
|
|
136
136
|
|
|
137
137
|
token = await self.get_bearer_token()
|
|
138
|
-
url = f"{self.API_BASE_URL}/api/v1/connectors/
|
|
138
|
+
url = f"{self.API_BASE_URL}/api/v1/connectors/connectors_for_user"
|
|
139
139
|
params = {
|
|
140
140
|
"external_user_id": external_user_id,
|
|
141
141
|
"definition_id": connector_definition_id,
|
|
@@ -146,24 +146,24 @@ class AirbyteCloudClient:
|
|
|
146
146
|
response.raise_for_status()
|
|
147
147
|
|
|
148
148
|
data = response.json()
|
|
149
|
-
|
|
149
|
+
connectors = data["connectors"]
|
|
150
150
|
|
|
151
|
-
if len(
|
|
152
|
-
raise ValueError(f"No connector
|
|
151
|
+
if len(connectors) == 0:
|
|
152
|
+
raise ValueError(f"No connector found for user '{external_user_id}' and connector definition '{connector_definition_id}'")
|
|
153
153
|
|
|
154
|
-
if len(
|
|
154
|
+
if len(connectors) > 1:
|
|
155
155
|
raise ValueError(
|
|
156
|
-
f"Multiple
|
|
157
|
-
f"and connector '{connector_definition_id}'. Expected exactly 1, "
|
|
158
|
-
f"found {len(
|
|
156
|
+
f"Multiple connectors found for user '{external_user_id}' "
|
|
157
|
+
f"and connector definition '{connector_definition_id}'. Expected exactly 1, "
|
|
158
|
+
f"found {len(connectors)}"
|
|
159
159
|
)
|
|
160
160
|
|
|
161
|
-
|
|
162
|
-
return
|
|
161
|
+
connector_id = connectors[0]["id"]
|
|
162
|
+
return connector_id
|
|
163
163
|
|
|
164
164
|
async def execute_connector(
|
|
165
165
|
self,
|
|
166
|
-
|
|
166
|
+
connector_id: str,
|
|
167
167
|
entity: str,
|
|
168
168
|
action: str,
|
|
169
169
|
params: dict[str, Any] | None,
|
|
@@ -171,7 +171,7 @@ class AirbyteCloudClient:
|
|
|
171
171
|
"""Execute a connector operation.
|
|
172
172
|
|
|
173
173
|
Args:
|
|
174
|
-
|
|
174
|
+
connector_id: Connector UUID (source ID)
|
|
175
175
|
entity: Entity name (e.g., "customers", "invoices")
|
|
176
176
|
action: Operation action (e.g., "list", "get", "create")
|
|
177
177
|
params: Optional parameters for the operation
|
|
@@ -185,14 +185,14 @@ class AirbyteCloudClient:
|
|
|
185
185
|
|
|
186
186
|
Example:
|
|
187
187
|
result = await client.execute_connector(
|
|
188
|
-
|
|
188
|
+
connector_id="550e8400-e29b-41d4-a716-446655440000",
|
|
189
189
|
entity="customers",
|
|
190
190
|
action="list",
|
|
191
191
|
params={"limit": 10}
|
|
192
192
|
)
|
|
193
193
|
"""
|
|
194
194
|
token = await self.get_bearer_token()
|
|
195
|
-
url = f"{self.API_BASE_URL}/api/v1/connectors/
|
|
195
|
+
url = f"{self.API_BASE_URL}/api/v1/connectors/sources/{connector_id}/execute"
|
|
196
196
|
headers = {"Authorization": f"Bearer {token}"}
|
|
197
197
|
request_body = {
|
|
198
198
|
"entity": entity,
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
+
import logging
|
|
5
6
|
import re
|
|
6
7
|
from pathlib import Path
|
|
7
8
|
from typing import Any
|
|
@@ -393,16 +394,24 @@ def convert_openapi_to_connector_model(spec: OpenAPIConnector) -> ConnectorModel
|
|
|
393
394
|
for entity_name, endpoints_dict in entities_map.items():
|
|
394
395
|
actions = list(endpoints_dict.keys())
|
|
395
396
|
|
|
396
|
-
# Get schema from components if available
|
|
397
|
+
# Get schema and stream_name from components if available
|
|
397
398
|
schema = None
|
|
399
|
+
entity_stream_name = None
|
|
398
400
|
if spec.components:
|
|
399
401
|
# Look for a schema matching the entity name
|
|
400
402
|
for schema_name, schema_def in spec.components.schemas.items():
|
|
401
403
|
if schema_def.x_airbyte_entity_name == entity_name or schema_name.lower() == entity_name.lower():
|
|
402
404
|
schema = schema_def.model_dump(by_alias=True)
|
|
405
|
+
entity_stream_name = schema_def.x_airbyte_stream_name
|
|
403
406
|
break
|
|
404
407
|
|
|
405
|
-
entity = EntityDefinition(
|
|
408
|
+
entity = EntityDefinition(
|
|
409
|
+
name=entity_name,
|
|
410
|
+
stream_name=entity_stream_name,
|
|
411
|
+
actions=actions,
|
|
412
|
+
endpoints=endpoints_dict,
|
|
413
|
+
schema=schema,
|
|
414
|
+
)
|
|
406
415
|
entities.append(entity)
|
|
407
416
|
|
|
408
417
|
# Extract retry config from x-airbyte-retry-config extension
|
|
@@ -760,8 +769,6 @@ def _parse_auth_from_openapi(spec: OpenAPIConnector) -> AuthConfig:
|
|
|
760
769
|
options.append(auth_option)
|
|
761
770
|
except Exception as e:
|
|
762
771
|
# Log warning but continue - skip invalid schemes
|
|
763
|
-
import logging
|
|
764
|
-
|
|
765
772
|
logger = logging.getLogger(__name__)
|
|
766
773
|
logger.warning(f"Skipping invalid security scheme '{scheme_name}': {e}")
|
|
767
774
|
continue
|
|
@@ -21,7 +21,7 @@ class HostedExecutor:
|
|
|
21
21
|
|
|
22
22
|
The executor takes an external_user_id and uses the AirbyteCloudClient to:
|
|
23
23
|
1. Authenticate with the Airbyte Platform (bearer token with caching)
|
|
24
|
-
2. Look up the user's connector
|
|
24
|
+
2. Look up the user's connector
|
|
25
25
|
3. Execute the connector operation via the cloud API
|
|
26
26
|
|
|
27
27
|
Implements ExecutorProtocol.
|
|
@@ -63,7 +63,7 @@ class HostedExecutor:
|
|
|
63
63
|
airbyte_client_id: Airbyte client ID for authentication
|
|
64
64
|
airbyte_client_secret: Airbyte client secret for authentication
|
|
65
65
|
connector_definition_id: Connector definition ID used to look up
|
|
66
|
-
the user's connector
|
|
66
|
+
the user's connector.
|
|
67
67
|
|
|
68
68
|
Example:
|
|
69
69
|
executor = HostedExecutor(
|
|
@@ -86,8 +86,8 @@ class HostedExecutor:
|
|
|
86
86
|
"""Execute connector via cloud API (ExecutorProtocol implementation).
|
|
87
87
|
|
|
88
88
|
Flow:
|
|
89
|
-
1. Get connector id from
|
|
90
|
-
2. Look up the user's connector
|
|
89
|
+
1. Get connector definition id from executor config
|
|
90
|
+
2. Look up the user's connector ID
|
|
91
91
|
3. Execute the connector operation via the cloud API
|
|
92
92
|
4. Parse the response into ExecutionResult
|
|
93
93
|
|
|
@@ -98,7 +98,7 @@ class HostedExecutor:
|
|
|
98
98
|
ExecutionResult with success/failure status
|
|
99
99
|
|
|
100
100
|
Raises:
|
|
101
|
-
ValueError: If no
|
|
101
|
+
ValueError: If no connector or multiple connectors found for user
|
|
102
102
|
httpx.HTTPStatusError: If API returns 4xx/5xx status code
|
|
103
103
|
httpx.RequestError: If network request fails
|
|
104
104
|
|
|
@@ -126,24 +126,23 @@ class HostedExecutor:
|
|
|
126
126
|
# Step 1: Get connector definition id
|
|
127
127
|
connector_definition_id = self._connector_definition_id
|
|
128
128
|
|
|
129
|
-
# Step 2: Get the connector
|
|
130
|
-
|
|
129
|
+
# Step 2: Get the connector ID for this user
|
|
130
|
+
connector_id = await self._cloud_client.get_connector_id(
|
|
131
131
|
external_user_id=self._external_user_id,
|
|
132
132
|
connector_definition_id=connector_definition_id,
|
|
133
133
|
)
|
|
134
134
|
|
|
135
|
-
span.set_attribute("connector.
|
|
135
|
+
span.set_attribute("connector.connector_id", connector_id)
|
|
136
136
|
|
|
137
137
|
# Step 3: Execute the connector via the cloud API
|
|
138
138
|
response = await self._cloud_client.execute_connector(
|
|
139
|
-
|
|
139
|
+
connector_id=connector_id,
|
|
140
140
|
entity=config.entity,
|
|
141
141
|
action=config.action,
|
|
142
142
|
params=config.params,
|
|
143
143
|
)
|
|
144
144
|
|
|
145
145
|
# Step 4: Parse the response into ExecutionResult
|
|
146
|
-
# The response_data is a dict from the API
|
|
147
146
|
result = self._parse_execution_result(response)
|
|
148
147
|
|
|
149
148
|
# Mark span as successful
|
|
@@ -152,7 +151,7 @@ class HostedExecutor:
|
|
|
152
151
|
return result
|
|
153
152
|
|
|
154
153
|
except ValueError as e:
|
|
155
|
-
#
|
|
154
|
+
# Connector lookup validation error (0 or >1 connectors)
|
|
156
155
|
span.set_attribute("connector.success", False)
|
|
157
156
|
span.set_attribute("connector.error_type", "ValueError")
|
|
158
157
|
span.record_exception(e)
|