Skip to content

Commit 27ccaa2

Browse files
awalker4awalker4
committed
Fix up merge issues
1 parent 89bade7 commit 27ccaa2

File tree

9 files changed

+30
-195
lines changed

9 files changed

+30
-195
lines changed

‎docs/sdks/jobs/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ with UnstructuredClient() as uc_client:
166166
| ---------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
167167
| `request` | [operations.GetJobDetailsRequest](../../models/operations/getjobdetailsrequest.md) | :heavy_check_mark: | The request object to use for the request. |
168168
| `retries` | [Optional[utils.RetryConfig]](../../models/utils/retryconfig.md) | :heavy_minus_sign: | Configuration to override the default retry behavior of the client. |
169-
| `server_url` | *Optional[str]* | :heavy_minus_sign: | An optional server URL to use. |
170169

171170
### Response
172171

@@ -208,7 +207,6 @@ with UnstructuredClient() as uc_client:
208207
| ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------ |
209208
| `request` | [operations.GetJobFailedFilesRequest](../../models/operations/getjobfailedfilesrequest.md) | :heavy_check_mark: | The request object to use for the request. |
210209
| `retries` | [Optional[utils.RetryConfig]](../../models/utils/retryconfig.md) | :heavy_minus_sign: | Configuration to override the default retry behavior of the client. |
211-
| `server_url` | *Optional[str]* | :heavy_minus_sign: | An optional server URL to use. |
212210

213211
### Response
214212

‎docs/sdks/users/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ with UnstructuredClient() as uc_client:
3535
| -------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
3636
| `request` | [operations.GetEncryptionCertificateRequest](../../models/operations/getencryptioncertificaterequest.md) | :heavy_check_mark: | The request object to use for the request. |
3737
| `retries` | [Optional[utils.RetryConfig]](../../models/utils/retryconfig.md) | :heavy_minus_sign: | Configuration to override the default retry behavior of the client. |
38-
| `server_url` | *Optional[str]* | :heavy_minus_sign: | An optional server URL to use. |
3938

4039
### Response
4140

@@ -79,7 +78,6 @@ with UnstructuredClient() as uc_client:
7978
| ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ | ------------------------------------------------------------------------------ |
8079
| `request` | [operations.StoreSecretRequest](../../models/operations/storesecretrequest.md) | :heavy_check_mark: | The request object to use for the request. |
8180
| `retries` | [Optional[utils.RetryConfig]](../../models/utils/retryconfig.md) | :heavy_minus_sign: | Configuration to override the default retry behavior of the client. |
82-
| `server_url` | *Optional[str]* | :heavy_minus_sign: | An optional server URL to use. |
8381

8482
### Response
8583

‎src/unstructured_client/jobs.py‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,11 +686,16 @@ def get_job_details(
686686
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
687687
:param http_headers: Additional headers to set or replace on requests.
688688
"""
689-
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
689+
base_url = None
690690
url_variables = None
691691
if timeout_ms is None:
692692
timeout_ms = self.sdk_configuration.timeout_ms
693693

694+
if server_url is not None:
695+
base_url = server_url
696+
else:
697+
base_url = self._get_url(base_url, url_variables)
698+
694699
if not isinstance(request, BaseModel):
695700
request = utils.unmarshal(request, operations.GetJobDetailsRequest)
696701
request = cast(operations.GetJobDetailsRequest, request)
@@ -792,11 +797,16 @@ async def get_job_details_async(
792797
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
793798
:param http_headers: Additional headers to set or replace on requests.
794799
"""
795-
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
800+
base_url = None
796801
url_variables = None
797802
if timeout_ms is None:
798803
timeout_ms = self.sdk_configuration.timeout_ms
799804

805+
if server_url is not None:
806+
base_url = server_url
807+
else:
808+
base_url = self._get_url(base_url, url_variables)
809+
800810
if not isinstance(request, BaseModel):
801811
request = utils.unmarshal(request, operations.GetJobDetailsRequest)
802812
request = cast(operations.GetJobDetailsRequest, request)
@@ -899,11 +909,16 @@ def get_job_failed_files(
899909
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
900910
:param http_headers: Additional headers to set or replace on requests.
901911
"""
902-
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
912+
base_url = None
903913
url_variables = None
904914
if timeout_ms is None:
905915
timeout_ms = self.sdk_configuration.timeout_ms
906916

917+
if server_url is not None:
918+
base_url = server_url
919+
else:
920+
base_url = self._get_url(base_url, url_variables)
921+
907922
if not isinstance(request, BaseModel):
908923
request = utils.unmarshal(request, operations.GetJobFailedFilesRequest)
909924
request = cast(operations.GetJobFailedFilesRequest, request)
@@ -1006,11 +1021,16 @@ async def get_job_failed_files_async(
10061021
:param timeout_ms: Override the default request timeout configuration for this method in milliseconds
10071022
:param http_headers: Additional headers to set or replace on requests.
10081023
"""
1009-
base_url = clean_server_url(server_url) if server_url is not None else self.get_default_server_url()
1024+
base_url = None
10101025
url_variables = None
10111026
if timeout_ms is None:
10121027
timeout_ms = self.sdk_configuration.timeout_ms
10131028

1029+
if server_url is not None:
1030+
base_url = server_url
1031+
else:
1032+
base_url = self._get_url(base_url, url_variables)
1033+
10141034
if not isinstance(request, BaseModel):
10151035
request = utils.unmarshal(request, operations.GetJobFailedFilesRequest)
10161036
request = cast(operations.GetJobFailedFilesRequest, request)

0 commit comments

Comments
 (0)