Skip to content

Commit 582e95f

Browse files
awalker4awalker4
committed
Bring back patched server url code
1 parent 23588e5 commit 582e95f

File tree

6 files changed

+99
-368
lines changed

6 files changed

+99
-368
lines changed

‎.genignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,13 @@ _test_unstructured_client
88
# ignore Makefile
99
Makefile
1010

11+
# Ignore the base resource classes while we're patching in our own server url logic
12+
# If we add a new endpoint, we need to:
13+
# - Comment out the ignore for the right file
14+
# - Generate locally, watch the new endpoint appear
15+
# - Bring back the ignore line and commit
16+
src/unstructured_client/destinations.py
17+
src/unstructured_client/general.py
18+
src/unstructured_client/jobs.py
19+
src/unstructured_client/sources.py
20+
src/unstructured_client/workflows.py

‎src/unstructured_client/destinations.py

Lines changed: 22 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
2-
2+
from unstructured_client._hooks.custom.clean_server_url_hook import clean_server_url
33
from .basesdk import BaseSDK
44
from typing import Any, List, Mapping, Optional, Union, cast
55
from unstructured_client import utils
66
from unstructured_client._hooks import HookContext
77
from unstructured_client.models import errors, operations, shared
88
from unstructured_client.types import BaseModel, OptionalNullable, UNSET
99

10-
1110
class Destinations(BaseSDK):
11+
def get_default_server_url(self) -> str:
12+
client_url, *_ = self.sdk_configuration.get_server_details()
13+
return clean_server_url(client_url)
14+
1215
def create_connection_check_destinations(
1316
self,
1417
*,
@@ -31,18 +34,11 @@ def create_connection_check_destinations(
3134
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
3235
:param http_headers: Additional headers to set or replace on requests.
3336
"""
34-
base_url = None
37+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
3538
url_variables = None
3639
if timeout_ms is None:
3740
timeout_ms = self.sdk_configuration.timeout_ms
3841

39-
if server_url is not None:
40-
base_url = server_url
41-
else:
42-
base_url = operations.CREATE_CONNECTION_CHECK_DESTINATIONS_SERVERS[
43-
operations.CREATE_CONNECTION_CHECK_DESTINATIONS_SERVER_PLATFORM_API
44-
]
45-
4642
if not isinstance(request, BaseModel):
4743
request = utils.unmarshal(
4844
request, operations.CreateConnectionCheckDestinationsRequest
@@ -146,17 +142,11 @@ async def create_connection_check_destinations_async(
146142
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
147143
:param http_headers: Additional headers to set or replace on requests.
148144
"""
149-
base_url = None
145+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
150146
url_variables = None
151147
if timeout_ms is None:
152148
timeout_ms = self.sdk_configuration.timeout_ms
153149

154-
if server_url is not None:
155-
base_url = server_url
156-
else:
157-
base_url = operations.CREATE_CONNECTION_CHECK_DESTINATIONS_SERVERS[
158-
operations.CREATE_CONNECTION_CHECK_DESTINATIONS_SERVER_PLATFORM_API
159-
]
160150

161151
if not isinstance(request, BaseModel):
162152
request = utils.unmarshal(
@@ -261,18 +251,12 @@ def create_destination(
261251
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
262252
:param http_headers: Additional headers to set or replace on requests.
263253
"""
264-
base_url = None
254+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
255+
265256
url_variables = None
266257
if timeout_ms is None:
267258
timeout_ms = self.sdk_configuration.timeout_ms
268259

269-
if server_url is not None:
270-
base_url = server_url
271-
else:
272-
base_url = operations.CREATE_DESTINATION_SERVERS[
273-
operations.CREATE_DESTINATION_SERVER_PLATFORM_API
274-
]
275-
276260
if not isinstance(request, BaseModel):
277261
request = utils.unmarshal(request, operations.CreateDestinationRequest)
278262
request = cast(operations.CreateDestinationRequest, request)
@@ -381,17 +365,11 @@ async def create_destination_async(
381365
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
382366
:param http_headers: Additional headers to set or replace on requests.
383367
"""
384-
base_url = None
368+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
385369
url_variables = None
386370
if timeout_ms is None:
387371
timeout_ms = self.sdk_configuration.timeout_ms
388372

389-
if server_url is not None:
390-
base_url = server_url
391-
else:
392-
base_url = operations.CREATE_DESTINATION_SERVERS[
393-
operations.CREATE_DESTINATION_SERVER_PLATFORM_API
394-
]
395373

396374
if not isinstance(request, BaseModel):
397375
request = utils.unmarshal(request, operations.CreateDestinationRequest)
@@ -501,17 +479,12 @@ def delete_destination(
501479
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
502480
:param http_headers: Additional headers to set or replace on requests.
503481
"""
504-
base_url = None
482+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
505483
url_variables = None
506484
if timeout_ms is None:
507485
timeout_ms = self.sdk_configuration.timeout_ms
508486

509-
if server_url is not None:
510-
base_url = server_url
511-
else:
512-
base_url = operations.DELETE_DESTINATION_SERVERS[
513-
operations.DELETE_DESTINATION_SERVER_PLATFORM_API
514-
]
487+
515488

516489
if not isinstance(request, BaseModel):
517490
request = utils.unmarshal(request, operations.DeleteDestinationRequest)
@@ -612,17 +585,11 @@ async def delete_destination_async(
612585
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
613586
:param http_headers: Additional headers to set or replace on requests.
614587
"""
615-
base_url = None
588+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
616589
url_variables = None
617590
if timeout_ms is None:
618591
timeout_ms = self.sdk_configuration.timeout_ms
619592

620-
if server_url is not None:
621-
base_url = server_url
622-
else:
623-
base_url = operations.DELETE_DESTINATION_SERVERS[
624-
operations.DELETE_DESTINATION_SERVER_PLATFORM_API
625-
]
626593

627594
if not isinstance(request, BaseModel):
628595
request = utils.unmarshal(request, operations.DeleteDestinationRequest)
@@ -723,17 +690,12 @@ def get_connection_check_destinations(
723690
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
724691
:param http_headers: Additional headers to set or replace on requests.
725692
"""
726-
base_url = None
693+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
727694
url_variables = None
728695
if timeout_ms is None:
729696
timeout_ms = self.sdk_configuration.timeout_ms
730697

731-
if server_url is not None:
732-
base_url = server_url
733-
else:
734-
base_url = operations.GET_CONNECTION_CHECK_DESTINATIONS_SERVERS[
735-
operations.GET_CONNECTION_CHECK_DESTINATIONS_SERVER_PLATFORM_API
736-
]
698+
737699

738700
if not isinstance(request, BaseModel):
739701
request = utils.unmarshal(
@@ -838,17 +800,11 @@ async def get_connection_check_destinations_async(
838800
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
839801
:param http_headers: Additional headers to set or replace on requests.
840802
"""
841-
base_url = None
803+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
842804
url_variables = None
843805
if timeout_ms is None:
844806
timeout_ms = self.sdk_configuration.timeout_ms
845807

846-
if server_url is not None:
847-
base_url = server_url
848-
else:
849-
base_url = operations.GET_CONNECTION_CHECK_DESTINATIONS_SERVERS[
850-
operations.GET_CONNECTION_CHECK_DESTINATIONS_SERVER_PLATFORM_API
851-
]
852808

853809
if not isinstance(request, BaseModel):
854810
request = utils.unmarshal(
@@ -952,17 +908,11 @@ def get_destination(
952908
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
953909
:param http_headers: Additional headers to set or replace on requests.
954910
"""
955-
base_url = None
911+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
956912
url_variables = None
957913
if timeout_ms is None:
958914
timeout_ms = self.sdk_configuration.timeout_ms
959915

960-
if server_url is not None:
961-
base_url = server_url
962-
else:
963-
base_url = operations.GET_DESTINATION_SERVERS[
964-
operations.GET_DESTINATION_SERVER_PLATFORM_API
965-
]
966916

967917
if not isinstance(request, BaseModel):
968918
request = utils.unmarshal(request, operations.GetDestinationRequest)
@@ -1064,17 +1014,11 @@ async def get_destination_async(
10641014
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
10651015
:param http_headers: Additional headers to set or replace on requests.
10661016
"""
1067-
base_url = None
1017+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
10681018
url_variables = None
10691019
if timeout_ms is None:
10701020
timeout_ms = self.sdk_configuration.timeout_ms
10711021

1072-
if server_url is not None:
1073-
base_url = server_url
1074-
else:
1075-
base_url = operations.GET_DESTINATION_SERVERS[
1076-
operations.GET_DESTINATION_SERVER_PLATFORM_API
1077-
]
10781022

10791023
if not isinstance(request, BaseModel):
10801024
request = utils.unmarshal(request, operations.GetDestinationRequest)
@@ -1177,18 +1121,11 @@ def list_destinations(
11771121
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
11781122
:param http_headers: Additional headers to set or replace on requests.
11791123
"""
1180-
base_url = None
1124+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
11811125
url_variables = None
11821126
if timeout_ms is None:
11831127
timeout_ms = self.sdk_configuration.timeout_ms
11841128

1185-
if server_url is not None:
1186-
base_url = server_url
1187-
else:
1188-
base_url = operations.LIST_DESTINATIONS_SERVERS[
1189-
operations.LIST_DESTINATIONS_SERVER_PLATFORM_API
1190-
]
1191-
11921129
if not isinstance(request, BaseModel):
11931130
request = utils.unmarshal(request, operations.ListDestinationsRequest)
11941131
request = cast(operations.ListDestinationsRequest, request)
@@ -1291,18 +1228,11 @@ async def list_destinations_async(
12911228
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
12921229
:param http_headers: Additional headers to set or replace on requests.
12931230
"""
1294-
base_url = None
1231+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
12951232
url_variables = None
12961233
if timeout_ms is None:
12971234
timeout_ms = self.sdk_configuration.timeout_ms
12981235

1299-
if server_url is not None:
1300-
base_url = server_url
1301-
else:
1302-
base_url = operations.LIST_DESTINATIONS_SERVERS[
1303-
operations.LIST_DESTINATIONS_SERVER_PLATFORM_API
1304-
]
1305-
13061236
if not isinstance(request, BaseModel):
13071237
request = utils.unmarshal(request, operations.ListDestinationsRequest)
13081238
request = cast(operations.ListDestinationsRequest, request)
@@ -1405,17 +1335,11 @@ def update_destination(
14051335
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
14061336
:param http_headers: Additional headers to set or replace on requests.
14071337
"""
1408-
base_url = None
1338+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
14091339
url_variables = None
14101340
if timeout_ms is None:
14111341
timeout_ms = self.sdk_configuration.timeout_ms
14121342

1413-
if server_url is not None:
1414-
base_url = server_url
1415-
else:
1416-
base_url = operations.UPDATE_DESTINATION_SERVERS[
1417-
operations.UPDATE_DESTINATION_SERVER_PLATFORM_API
1418-
]
14191343

14201344
if not isinstance(request, BaseModel):
14211345
request = utils.unmarshal(request, operations.UpdateDestinationRequest)
@@ -1525,18 +1449,11 @@ async def update_destination_async(
15251449
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
15261450
:param http_headers: Additional headers to set or replace on requests.
15271451
"""
1528-
base_url = None
1452+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
15291453
url_variables = None
15301454
if timeout_ms is None:
15311455
timeout_ms = self.sdk_configuration.timeout_ms
15321456

1533-
if server_url is not None:
1534-
base_url = server_url
1535-
else:
1536-
base_url = operations.UPDATE_DESTINATION_SERVERS[
1537-
operations.UPDATE_DESTINATION_SERVER_PLATFORM_API
1538-
]
1539-
15401457
if not isinstance(request, BaseModel):
15411458
request = utils.unmarshal(request, operations.UpdateDestinationRequest)
15421459
request = cast(operations.UpdateDestinationRequest, request)

‎src/unstructured_client/general.py

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
22

3+
from unstructured_client._hooks.custom.clean_server_url_hook import clean_server_url
34
from .basesdk import BaseSDK
45
from enum import Enum
56
from typing import Any, Dict, List, Mapping, Optional, Union, cast
67
from unstructured_client import utils
78
from unstructured_client._hooks import HookContext
89
from unstructured_client.models import errors, operations, shared
910
from unstructured_client.types import BaseModel, OptionalNullable, UNSET
10-
11+
from unstructured_client.sdkconfiguration import SERVER_PLATFORM_API, SERVERS
1112

1213
class PartitionAcceptEnum(str, Enum):
1314
APPLICATION_JSON = "application/json"
1415
TEXT_CSV = "text/csv"
1516

1617

1718
class General(BaseSDK):
19+
def get_default_server_url(self) -> str:
20+
client_url, *_ = self.sdk_configuration.get_server_details()
21+
if client_url == SERVERS[SERVER_PLATFORM_API].rstrip("/"):
22+
#Note(yuming):get_server_details will set the default server to platform-api
23+
return operations.PARTITION_SERVERS[
24+
operations.PARTITION_SERVER_SAAS_API
25+
].rstrip("/")
26+
return clean_server_url(client_url)
27+
1828
def partition(
1929
self,
2030
*,
@@ -38,18 +48,12 @@ def partition(
3848
:param accept_header_override: Override the default accept header for this method
3949
:param http_headers: Additional headers to set or replace on requests.
4050
"""
41-
base_url = None
51+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
52+
4253
url_variables = None
4354
if timeout_ms is None:
4455
timeout_ms = self.sdk_configuration.timeout_ms
4556

46-
if server_url is not None:
47-
base_url = server_url
48-
else:
49-
base_url = operations.PARTITION_SERVERS[
50-
operations.PARTITION_SERVER_SAAS_API
51-
]
52-
5357
if not isinstance(request, BaseModel):
5458
request = utils.unmarshal(request, operations.PartitionRequest)
5559
request = cast(operations.PartitionRequest, request)
@@ -166,18 +170,12 @@ async def partition_async(
166170
:param accept_header_override: Override the default accept header for this method
167171
:param http_headers: Additional headers to set or replace on requests.
168172
"""
169-
base_url = None
173+
174+
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
170175
url_variables = None
171176
if timeout_ms is None:
172177
timeout_ms = self.sdk_configuration.timeout_ms
173178

174-
if server_url is not None:
175-
base_url = server_url
176-
else:
177-
base_url = operations.PARTITION_SERVERS[
178-
operations.PARTITION_SERVER_SAAS_API
179-
]
180-
181179
if not isinstance(request, BaseModel):
182180
request = utils.unmarshal(request, operations.PartitionRequest)
183181
request = cast(operations.PartitionRequest, request)

0 commit comments

Comments
 (0)