udl-sdk 0.1.0a15__py3-none-any.whl → 0.1.0a17__py3-none-any.whl

unifieddatalibrary/_base_client.py

@@ -551,7 +551,10 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
         is_body_allowed = options.method.lower() != "get"
 
         if is_body_allowed:
-            kwargs["json"] = json_data if is_given(json_data) else None
+            if isinstance(json_data, bytes):
+                kwargs["content"] = json_data
+            else:
+                kwargs["json"] = json_data if is_given(json_data) else None
             kwargs["files"] = files
         else:
             headers.pop("Content-Type", None)

unifieddatalibrary/_client.py

@@ -14,6 +14,7 @@ from ._qs import Querystring
 from ._types import (
     NOT_GIVEN,
     Omit,
+    Headers,
     Timeout,
     NotGiven,
     Transport,
@@ -117,7 +118,7 @@ from .resources import (
     seradata_spacecraft_details,
 )
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
-from ._exceptions import APIStatusError, UnifieddatalibraryError
+from ._exceptions import APIStatusError
 from ._base_client import (
     DEFAULT_MAX_RETRIES,
     SyncAPIClient,
@@ -377,14 +378,16 @@ class Unifieddatalibrary(SyncAPIClient):
     with_streaming_response: UnifieddatalibraryWithStreamedResponse
 
     # client options
-    password: str
-    username: str
+    password: str | None
+    username: str | None
+    access_token: str | None
 
     def __init__(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -409,23 +412,20 @@ class Unifieddatalibrary(SyncAPIClient):
         This automatically infers the following arguments from their corresponding environment variables if they are not provided:
         - `password` from `UDL_AUTH_PASSWORD`
         - `username` from `UDL_AUTH_USERNAME`
+        - `access_token` from `UDL_ACCESS_TOKEN`
         """
         if password is None:
             password = os.environ.get("UDL_AUTH_PASSWORD")
-        if password is None:
-            raise UnifieddatalibraryError(
-                "The password client option must be set either by passing password to the client or by setting the UDL_AUTH_PASSWORD environment variable"
-            )
         self.password = password
 
         if username is None:
             username = os.environ.get("UDL_AUTH_USERNAME")
-        if username is None:
-            raise UnifieddatalibraryError(
-                "The username client option must be set either by passing username to the client or by setting the UDL_AUTH_USERNAME environment variable"
-            )
         self.username = username
 
+        if access_token is None:
+            access_token = os.environ.get("UDL_ACCESS_TOKEN")
+        self.access_token = access_token
+
         if base_url is None:
             base_url = os.environ.get("UNIFIEDDATALIBRARY_BASE_URL")
         self._base_url_overridden = base_url is not None
@@ -618,10 +618,25 @@ class Unifieddatalibrary(SyncAPIClient):
     @property
     @override
     def auth_headers(self) -> dict[str, str]:
+        return {**self._basic_auth, **self._bearer_auth}
+
+    @property
+    def _basic_auth(self) -> dict[str, str]:
+        if self.username is None:
+            return {}
+        if self.password is None:
+            return {}
         credentials = f"{self.username}:{self.password}".encode("ascii")
         header = f"Basic {base64.b64encode(credentials).decode('ascii')}"
         return {"Authorization": header}
 
+    @property
+    def _bearer_auth(self) -> dict[str, str]:
+        access_token = self.access_token
+        if access_token is None:
+            return {}
+        return {"Authorization": f"Bearer {access_token}"}
+
     @property
     @override
     def default_headers(self) -> dict[str, str | Omit]:
@@ -631,11 +646,28 @@ class Unifieddatalibrary(SyncAPIClient):
             **self._custom_headers,
         }
 
+    @override
+    def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
+        if self.username and self.password and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        if self.access_token and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        raise TypeError(
+            '"Could not resolve authentication method. Expected either username, password or access_token to be set. Or for one of the `Authorization` or `Authorization` headers to be explicitly omitted"'
+        )
+
     def copy(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
         http_client: httpx.Client | None = None,
@@ -671,6 +703,7 @@ class Unifieddatalibrary(SyncAPIClient):
         client = self.__class__(
             password=password or self.password,
             username=username or self.username,
+            access_token=access_token or self.access_token,
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,
@@ -889,14 +922,16 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
     with_streaming_response: AsyncUnifieddatalibraryWithStreamedResponse
 
     # client options
-    password: str
-    username: str
+    password: str | None
+    username: str | None
+    access_token: str | None
 
     def __init__(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: Union[float, Timeout, None, NotGiven] = NOT_GIVEN,
         max_retries: int = DEFAULT_MAX_RETRIES,
@@ -921,23 +956,20 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
         This automatically infers the following arguments from their corresponding environment variables if they are not provided:
         - `password` from `UDL_AUTH_PASSWORD`
         - `username` from `UDL_AUTH_USERNAME`
+        - `access_token` from `UDL_ACCESS_TOKEN`
         """
         if password is None:
             password = os.environ.get("UDL_AUTH_PASSWORD")
-        if password is None:
-            raise UnifieddatalibraryError(
-                "The password client option must be set either by passing password to the client or by setting the UDL_AUTH_PASSWORD environment variable"
-            )
         self.password = password
 
         if username is None:
             username = os.environ.get("UDL_AUTH_USERNAME")
-        if username is None:
-            raise UnifieddatalibraryError(
-                "The username client option must be set either by passing username to the client or by setting the UDL_AUTH_USERNAME environment variable"
-            )
         self.username = username
 
+        if access_token is None:
+            access_token = os.environ.get("UDL_ACCESS_TOKEN")
+        self.access_token = access_token
+
         if base_url is None:
             base_url = os.environ.get("UNIFIEDDATALIBRARY_BASE_URL")
         self._base_url_overridden = base_url is not None
@@ -1130,10 +1162,25 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
     @property
     @override
     def auth_headers(self) -> dict[str, str]:
+        return {**self._basic_auth, **self._bearer_auth}
+
+    @property
+    def _basic_auth(self) -> dict[str, str]:
+        if self.username is None:
+            return {}
+        if self.password is None:
+            return {}
         credentials = f"{self.username}:{self.password}".encode("ascii")
         header = f"Basic {base64.b64encode(credentials).decode('ascii')}"
         return {"Authorization": header}
 
+    @property
+    def _bearer_auth(self) -> dict[str, str]:
+        access_token = self.access_token
+        if access_token is None:
+            return {}
+        return {"Authorization": f"Bearer {access_token}"}
+
     @property
     @override
     def default_headers(self) -> dict[str, str | Omit]:
@@ -1143,11 +1190,28 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
             **self._custom_headers,
         }
 
+    @override
+    def _validate_headers(self, headers: Headers, custom_headers: Headers) -> None:
+        if self.username and self.password and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        if self.access_token and headers.get("Authorization"):
+            return
+        if isinstance(custom_headers.get("Authorization"), Omit):
+            return
+
+        raise TypeError(
+            '"Could not resolve authentication method. Expected either username, password or access_token to be set. Or for one of the `Authorization` or `Authorization` headers to be explicitly omitted"'
+        )
+
     def copy(
         self,
         *,
         password: str | None = None,
         username: str | None = None,
+        access_token: str | None = None,
         base_url: str | httpx.URL | None = None,
         timeout: float | Timeout | None | NotGiven = NOT_GIVEN,
         http_client: httpx.AsyncClient | None = None,
@@ -1183,6 +1247,7 @@ class AsyncUnifieddatalibrary(AsyncAPIClient):
         client = self.__class__(
             password=password or self.password,
             username=username or self.username,
+            access_token=access_token or self.access_token,
             base_url=base_url or self.base_url,
             timeout=self.timeout if isinstance(timeout, NotGiven) else timeout,
             http_client=http_client,

unifieddatalibrary/_files.py

@@ -69,12 +69,12 @@ def _transform_file(file: FileTypes) -> HttpxFileTypes:
         return file
 
     if is_tuple_t(file):
-        return (file[0], _read_file_content(file[1]), *file[2:])
+        return (file[0], read_file_content(file[1]), *file[2:])
 
     raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
-def _read_file_content(file: FileContent) -> HttpxFileContent:
+def read_file_content(file: FileContent) -> HttpxFileContent:
     if isinstance(file, os.PathLike):
         return pathlib.Path(file).read_bytes()
     return file
@@ -111,12 +111,12 @@ async def _async_transform_file(file: FileTypes) -> HttpxFileTypes:
         return file
 
     if is_tuple_t(file):
-        return (file[0], await _async_read_file_content(file[1]), *file[2:])
+        return (file[0], await async_read_file_content(file[1]), *file[2:])
 
     raise TypeError(f"Expected file types input to be a FileContent type or to be a tuple")
 
 
-async def _async_read_file_content(file: FileContent) -> HttpxFileContent:
+async def async_read_file_content(file: FileContent) -> HttpxFileContent:
     if isinstance(file, os.PathLike):
         return await anyio.Path(file).read_bytes()
 

unifieddatalibrary/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "unifieddatalibrary"
-__version__ = "0.1.0-alpha.15"  # x-release-please-version
+__version__ = "0.1.0-alpha.17"  # x-release-please-version

unifieddatalibrary/resources/air_load_plans.py

@@ -27,8 +27,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.airloadplan_full import AirloadplanFull
 from ..types.airloadplan_abridged import AirloadplanAbridged
+from ..types.shared.airloadplan_full import AirloadplanFull
 from ..types.air_load_plan_tuple_response import AirLoadPlanTupleResponse
 from ..types.air_load_plan_queryhelp_response import AirLoadPlanQueryhelpResponse
 

unifieddatalibrary/resources/air_operations/air_tasking_orders.py

@@ -28,7 +28,7 @@ from ...types.air_operations import (
     air_tasking_order_retrieve_params,
     air_tasking_order_unvalidated_publish_params,
 )
-from ...types.air_operations.air_tasking_order_full import AirTaskingOrderFull
+from ...types.shared.air_tasking_order_full import AirTaskingOrderFull
 from ...types.air_operations.airtaskingorder_abridged import AirtaskingorderAbridged
 from ...types.air_operations.air_tasking_order_tuple_response import AirTaskingOrderTupleResponse
 from ...types.air_operations.air_tasking_order_query_help_response import AirTaskingOrderQueryHelpResponse

unifieddatalibrary/resources/air_operations/crewpapers.py

@@ -6,7 +6,8 @@ from typing_extensions import Literal
 
 import httpx
 
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven, FileTypes
+from ..._files import read_file_content, async_read_file_content
+from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven, FileContent
 from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -85,12 +86,12 @@ class CrewpapersResource(SyncAPIResource):
 
     def upload_pdf(
         self,
+        params: FileContent,
         *,
         aircraft_sortie_ids: str,
         classification_marking: str,
         paper_status: Literal["PUBLISHED", "DELETED", "UPDATED", "READ"],
         papers_version: str,
-        body: FileTypes,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -122,9 +123,10 @@ class CrewpapersResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        extra_headers["Content-Type"] = "application/pdf"
         return self._post(
             "/filedrop/crewpapers",
-            body=maybe_transform(body, crewpaper_upload_pdf_params.CrewpaperUploadPdfParams),
+            body=read_file_content(params),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -207,12 +209,12 @@ class AsyncCrewpapersResource(AsyncAPIResource):
 
     async def upload_pdf(
         self,
+        params: FileContent,
         *,
         aircraft_sortie_ids: str,
         classification_marking: str,
         paper_status: Literal["PUBLISHED", "DELETED", "UPDATED", "READ"],
         papers_version: str,
-        body: FileTypes,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -244,9 +246,10 @@ class AsyncCrewpapersResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        extra_headers["Content-Type"] = "application/pdf"
         return await self._post(
             "/filedrop/crewpapers",
-            body=await async_maybe_transform(body, crewpaper_upload_pdf_params.CrewpaperUploadPdfParams),
+            body=await async_read_file_content(params),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

unifieddatalibrary/resources/aircraft.py

@@ -26,9 +26,9 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.aircraft_full import AircraftFull
 from ..types.aircraft_abridged import AircraftAbridged
 from ..types.entity_ingest_param import EntityIngestParam
+from ..types.shared.aircraft_full import AircraftFull
 from ..types.aircraft_queryhelp_response import AircraftQueryhelpResponse
 from ..types.aircraft_tuple_query_response import AircraftTupleQueryResponse
 

unifieddatalibrary/resources/aircraft_sorties.py

@@ -20,9 +20,9 @@ from .._response import (
     async_to_streamed_response_wrapper,
 )
 from .._base_client import make_request_options
+from ..types.shared.aircraftsortie_full import AircraftsortieFull
 from ..types.aircraft_sorty_tuple_response import AircraftSortyTupleResponse
 from ..types.aircraft_sorty_queryhelp_response import AircraftSortyQueryhelpResponse
-from ..types.air_operations.aircraftsortie_full import AircraftsortieFull
 
 __all__ = ["AircraftSortiesResource", "AsyncAircraftSortiesResource"]
 

unifieddatalibrary/resources/aircraft_status_remarks.py

@@ -28,8 +28,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.aircraftstatusremark_full import AircraftstatusremarkFull
 from ..types.aircraftstatusremark_abridged import AircraftstatusremarkAbridged
+from ..types.shared.aircraftstatusremark_full import AircraftstatusremarkFull
 from ..types.aircraft_status_remark_tuple_response import AircraftStatusRemarkTupleResponse
 from ..types.aircraft_status_remark_queryhelp_response import AircraftStatusRemarkQueryhelpResponse
 

unifieddatalibrary/resources/airfield_slot_consumptions.py

@@ -28,8 +28,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.airfieldslotconsumption_full import AirfieldslotconsumptionFull
 from ..types.airfieldslotconsumption_abridged import AirfieldslotconsumptionAbridged
+from ..types.shared.airfieldslotconsumption_full import AirfieldslotconsumptionFull
 from ..types.airfield_slot_consumption_tuple_response import AirfieldSlotConsumptionTupleResponse
 from ..types.airfield_slot_consumption_queryhelp_response import AirfieldSlotConsumptionQueryhelpResponse
 

unifieddatalibrary/resources/airfield_slots.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.airfieldslot_full import AirfieldslotFull
 from ..types.airfieldslot_abridged import AirfieldslotAbridged
+from ..types.shared.airfieldslot_full import AirfieldslotFull
 from ..types.airfield_slot_tuple_response import AirfieldSlotTupleResponse
 from ..types.airfield_slot_queryhelp_response import AirfieldSlotQueryhelpResponse
 

unifieddatalibrary/resources/airfield_status/airfield_status.py

@@ -36,8 +36,8 @@ from ..._response import (
 )
 from ...pagination import SyncOffsetPage, AsyncOffsetPage
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.airfieldstatus_full import AirfieldstatusFull
 from ...types.airfieldstatus_abridged import AirfieldstatusAbridged
+from ...types.shared.airfieldstatus_full import AirfieldstatusFull
 from ...types.airfield_status_tuple_response import AirfieldStatusTupleResponse
 from ...types.airfield_status_queryhelp_response import AirfieldStatusQueryhelpResponse
 

unifieddatalibrary/resources/airfield_status/history.py

@@ -17,7 +17,7 @@ from ..._response import (
 from ...pagination import SyncOffsetPage, AsyncOffsetPage
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.airfield_status import history_list_params, history_count_params
-from ...types.airfieldstatus_full import AirfieldstatusFull
+from ...types.shared.airfieldstatus_full import AirfieldstatusFull
 
 __all__ = ["HistoryResource", "AsyncHistoryResource"]
 

unifieddatalibrary/resources/airfields.py

@@ -27,8 +27,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.airfield_full import AirfieldFull
 from ..types.airfield_abridged import AirfieldAbridged
+from ..types.shared.airfield_full import AirfieldFull
 from ..types.airfield_tuple_response import AirfieldTupleResponse
 from ..types.airfield_queryhelp_response import AirfieldQueryhelpResponse
 

unifieddatalibrary/resources/airspace_control_orders.py

@@ -28,8 +28,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.airspacecontrolorder_full import AirspacecontrolorderFull
 from ..types.airspacecontrolorder_abridged import AirspacecontrolorderAbridged
+from ..types.shared.airspacecontrolorder_full import AirspacecontrolorderFull
 from ..types.airspace_control_order_tuple_response import AirspaceControlOrderTupleResponse
 from ..types.airspace_control_order_query_help_response import AirspaceControlOrderQueryHelpResponse
 

unifieddatalibrary/resources/analytic_imagery.py

@@ -38,8 +38,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.analytic_imagery_full import AnalyticImageryFull
 from ..types.analytic_imagery_abridged import AnalyticImageryAbridged
+from ..types.shared.analytic_imagery_full import AnalyticImageryFull
 from ..types.analytic_imagery_tuple_response import AnalyticImageryTupleResponse
 from ..types.analytic_imagery_history_response import AnalyticImageryHistoryResponse
 from ..types.analytic_imagery_queryhelp_response import AnalyticImageryQueryhelpResponse

unifieddatalibrary/resources/antennas.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.antenna_full import AntennaFull
 from ..types.antenna_abridged import AntennaAbridged
+from ..types.shared.antenna_full import AntennaFull
 from ..types.antenna_tuple_response import AntennaTupleResponse
 from ..types.antenna_queryhelp_response import AntennaQueryhelpResponse
 

unifieddatalibrary/resources/batteries.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.battery_full import BatteryFull
 from ..types.battery_abridged import BatteryAbridged
+from ..types.shared.battery_full import BatteryFull
 from ..types.battery_tuple_response import BatteryTupleResponse
 from ..types.battery_queryhelp_response import BatteryQueryhelpResponse
 

unifieddatalibrary/resources/batterydetails.py

@@ -25,8 +25,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.batterydetails_full import BatterydetailsFull
 from ..types.batterydetails_abridged import BatterydetailsAbridged
+from ..types.shared.batterydetails_full import BatterydetailsFull
 
 __all__ = ["BatterydetailsResource", "AsyncBatterydetailsResource"]
 

unifieddatalibrary/resources/beam.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.beam_full import BeamFull
 from ..types.beam_abridged import BeamAbridged
+from ..types.shared.beam_full import BeamFull
 from ..types.beam_tuple_response import BeamTupleResponse
 from ..types.beam_query_help_response import BeamQueryHelpResponse
 

unifieddatalibrary/resources/beam_contours.py

@@ -28,8 +28,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.beamcontour_full import BeamcontourFull
 from ..types.beamcontour_abridged import BeamcontourAbridged
+from ..types.shared.beamcontour_full import BeamcontourFull
 from ..types.beam_contour_tuple_response import BeamContourTupleResponse
 from ..types.beam_contour_query_help_response import BeamContourQueryHelpResponse
 

unifieddatalibrary/resources/buses.py

@@ -27,8 +27,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.bus_full import BusFull
 from ..types.bus_abridged import BusAbridged
+from ..types.shared.bus_full import BusFull
 from ..types.bus_tuple_response import BusTupleResponse
 from ..types.entity_ingest_param import EntityIngestParam
 from ..types.bus_query_help_response import BusQueryHelpResponse

unifieddatalibrary/resources/channels.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.channel_full import ChannelFull
 from ..types.channel_abridged import ChannelAbridged
+from ..types.shared.channel_full import ChannelFull
 from ..types.channel_tuple_response import ChannelTupleResponse
 from ..types.channel_queryhelp_response import ChannelQueryhelpResponse
 

unifieddatalibrary/resources/comm.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.comm_full import CommFull
 from ..types.comm_abridged import CommAbridged
+from ..types.shared.comm_full import CommFull
 from ..types.comm_tuple_response import CommTupleResponse
 from ..types.entity_ingest_param import EntityIngestParam
 from ..types.comm_queryhelp_response import CommQueryhelpResponse

unifieddatalibrary/resources/conjunctions/conjunctions.py

@@ -27,7 +27,8 @@ from .history import (
     HistoryResourceWithStreamingResponse,
     AsyncHistoryResourceWithStreamingResponse,
 )
-from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven, FileTypes
+from ..._files import read_file_content, async_read_file_content
+from ..._types import NOT_GIVEN, Body, Query, Headers, NoneType, NotGiven, FileContent
 from ..._utils import maybe_transform, async_maybe_transform
 from ..._compat import cached_property
 from ..._resource import SyncAPIResource, AsyncAPIResource
@@ -39,8 +40,8 @@ from ..._response import (
 )
 from ...pagination import SyncOffsetPage, AsyncOffsetPage
 from ..._base_client import AsyncPaginator, make_request_options
-from ...types.conjunction_full import ConjunctionFull
 from ...types.conjunction_abridged import ConjunctionAbridged
+from ...types.shared.conjunction_full import ConjunctionFull
 from ...types.conjunction_tuple_response import ConjunctionTupleResponse
 from ...types.conjunction_queryhelp_response import ConjunctionQueryhelpResponse
 from ...types.conjunction_get_history_response import ConjunctionGetHistoryResponse
@@ -814,12 +815,12 @@ class ConjunctionsResource(SyncAPIResource):
 
     def upload_conjunction_data_message(
         self,
+        aprams: FileContent,
         *,
         classification: str,
         data_mode: Literal["REAL", "TEST", "SIMULATED", "EXERCISE"],
         filename: str,
         source: str,
-        body: FileTypes,
         tags: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -863,11 +864,10 @@ class ConjunctionsResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        extra_headers["Content-Type"] = "application/zip"
         return self._post(
             "/filedrop/cdms",
-            body=maybe_transform(
-                body, conjunction_upload_conjunction_data_message_params.ConjunctionUploadConjunctionDataMessageParams
-            ),
+            body=read_file_content(aprams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -1654,12 +1654,12 @@ class AsyncConjunctionsResource(AsyncAPIResource):
 
     async def upload_conjunction_data_message(
         self,
+        aprams: FileContent,
         *,
         classification: str,
         data_mode: Literal["REAL", "TEST", "SIMULATED", "EXERCISE"],
         filename: str,
         source: str,
-        body: FileTypes,
         tags: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
@@ -1703,11 +1703,10 @@ class AsyncConjunctionsResource(AsyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         extra_headers = {"Accept": "*/*", **(extra_headers or {})}
+        extra_headers["Content-Type"] = "application/zip"
         return await self._post(
             "/filedrop/cdms",
-            body=await async_maybe_transform(
-                body, conjunction_upload_conjunction_data_message_params.ConjunctionUploadConjunctionDataMessageParams
-            ),
+            body=await async_read_file_content(aprams),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

unifieddatalibrary/resources/countries.py

@@ -26,8 +26,8 @@ from .._response import (
 )
 from ..pagination import SyncOffsetPage, AsyncOffsetPage
 from .._base_client import AsyncPaginator, make_request_options
-from ..types.country_full import CountryFull
 from ..types.country_abridged import CountryAbridged
+from ..types.shared.country_full import CountryFull
 from ..types.country_tuple_response import CountryTupleResponse
 from ..types.country_queryhelp_response import CountryQueryhelpResponse