samsara-api 4.3.0__py3-none-any.whl → 5.3.1__py3-none-any.whl

samsara/beta_ap_is/types/__init__.py

@@ -17,8 +17,6 @@ if typing.TYPE_CHECKING:
     from .get_qualification_types_request_entity_type import GetQualificationTypesRequestEntityType
     from .get_tag_group_safety_scores_request_score_type import GetTagGroupSafetyScoresRequestScoreType
     from .get_tag_safety_scores_request_score_type import GetTagSafetyScoresRequestScoreType
-    from .get_trips_request_completion_status import GetTripsRequestCompletionStatus
-    from .get_trips_request_query_by import GetTripsRequestQueryBy
 _dynamic_imports: typing.Dict[str, str] = {
     "FunctionsStartFunctionRunRequestBodyParamsOverride": ".functions_start_function_run_request_body_params_override",
     "GetAssetsInputsRequestType": ".get_assets_inputs_request_type",
@@ -29,8 +27,6 @@ _dynamic_imports: typing.Dict[str, str] = {
     "GetQualificationTypesRequestEntityType": ".get_qualification_types_request_entity_type",
     "GetTagGroupSafetyScoresRequestScoreType": ".get_tag_group_safety_scores_request_score_type",
     "GetTagSafetyScoresRequestScoreType": ".get_tag_safety_scores_request_score_type",
-    "GetTripsRequestCompletionStatus": ".get_trips_request_completion_status",
-    "GetTripsRequestQueryBy": ".get_trips_request_query_by",
 }
 
 
@@ -65,6 +61,4 @@ __all__ = [
     "GetQualificationTypesRequestEntityType",
     "GetTagGroupSafetyScoresRequestScoreType",
     "GetTagSafetyScoresRequestScoreType",
-    "GetTripsRequestCompletionStatus",
-    "GetTripsRequestQueryBy",
 ]

samsara/client.py

@@ -15,6 +15,7 @@ if typing.TYPE_CHECKING:
     from .alerts.client import AlertsClient, AsyncAlertsClient
     from .assets.client import AssetsClient, AsyncAssetsClient
     from .attributes.client import AsyncAttributesClient, AttributesClient
+    from .auth_token_for_driver.client import AsyncAuthTokenForDriverClient, AuthTokenForDriverClient
     from .beta_ap_is.client import AsyncBetaApIsClient, BetaApIsClient
     from .carrier_proposed_assignments.client import (
         AsyncCarrierProposedAssignmentsClient,
@@ -24,6 +25,7 @@ if typing.TYPE_CHECKING:
     from .contacts.client import AsyncContactsClient, ContactsClient
     from .documents.client import AsyncDocumentsClient, DocumentsClient
     from .driver_qr_codes.client import AsyncDriverQrCodesClient, DriverQrCodesClient
+    from .driver_trailer_assignments.client import AsyncDriverTrailerAssignmentsClient, DriverTrailerAssignmentsClient
     from .driver_vehicle_assignments.client import AsyncDriverVehicleAssignmentsClient, DriverVehicleAssignmentsClient
     from .drivers.client import AsyncDriversClient, DriversClient
     from .equipment.client import AsyncEquipmentClient, EquipmentClient
@@ -144,18 +146,19 @@ class Samsara:
         self._contacts: typing.Optional[ContactsClient] = None
         self._maintenance: typing.Optional[MaintenanceClient] = None
         self._fuel_and_energy: typing.Optional[FuelAndEnergyClient] = None
+        self._driver_trailer_assignments: typing.Optional[DriverTrailerAssignmentsClient] = None
         self._driver_qr_codes: typing.Optional[DriverQrCodesClient] = None
         self._carrier_proposed_assignments: typing.Optional[CarrierProposedAssignmentsClient] = None
         self._legacy_ap_is: typing.Optional[LegacyApIsClient] = None
         self._documents: typing.Optional[DocumentsClient] = None
         self._driver_vehicle_assignments: typing.Optional[DriverVehicleAssignmentsClient] = None
         self._drivers: typing.Optional[DriversClient] = None
+        self._auth_token_for_driver: typing.Optional[AuthTokenForDriverClient] = None
         self._tachograph_eu_only: typing.Optional[TachographEuOnlyClient] = None
         self._equipment: typing.Optional[EquipmentClient] = None
         self._hours_of_service: typing.Optional[HoursOfServiceClient] = None
         self._ifta: typing.Optional[IftaClient] = None
         self._routes: typing.Optional[RoutesClient] = None
-        self._safety: typing.Optional[SafetyClient] = None
         self._settings: typing.Optional[SettingsClient] = None
         self._trailers: typing.Optional[TrailersClient] = None
         self._vehicles: typing.Optional[VehiclesClient] = None
@@ -173,13 +176,14 @@ class Samsara:
         self._organization_info: typing.Optional[OrganizationInfoClient] = None
         self._preview_ap_is: typing.Optional[PreviewApIsClient] = None
         self._route_events: typing.Optional[RouteEventsClient] = None
+        self._safety: typing.Optional[SafetyClient] = None
         self._speeding_intervals: typing.Optional[SpeedingIntervalsClient] = None
         self._tags: typing.Optional[TagsClient] = None
+        self._trips: typing.Optional[TripsClient] = None
         self._users: typing.Optional[UsersClient] = None
         self._legacy: typing.Optional[LegacyClient] = None
         self._messages: typing.Optional[MessagesClient] = None
         self._trailer_assignments: typing.Optional[TrailerAssignmentsClient] = None
-        self._trips: typing.Optional[TripsClient] = None
         self._sensors: typing.Optional[SensorsClient] = None
         self._webhooks: typing.Optional[WebhooksClient] = None
         self._fleet: typing.Optional[FleetClient] = None
@@ -272,6 +276,14 @@ class Samsara:
             self._fuel_and_energy = FuelAndEnergyClient(client_wrapper=self._client_wrapper)
         return self._fuel_and_energy
 
+    @property
+    def driver_trailer_assignments(self):
+        if self._driver_trailer_assignments is None:
+            from .driver_trailer_assignments.client import DriverTrailerAssignmentsClient  # noqa: E402
+
+            self._driver_trailer_assignments = DriverTrailerAssignmentsClient(client_wrapper=self._client_wrapper)
+        return self._driver_trailer_assignments
+
     @property
     def driver_qr_codes(self):
         if self._driver_qr_codes is None:
@@ -320,6 +332,14 @@ class Samsara:
             self._drivers = DriversClient(client_wrapper=self._client_wrapper)
         return self._drivers
 
+    @property
+    def auth_token_for_driver(self):
+        if self._auth_token_for_driver is None:
+            from .auth_token_for_driver.client import AuthTokenForDriverClient  # noqa: E402
+
+            self._auth_token_for_driver = AuthTokenForDriverClient(client_wrapper=self._client_wrapper)
+        return self._auth_token_for_driver
+
     @property
     def tachograph_eu_only(self):
         if self._tachograph_eu_only is None:
@@ -360,14 +380,6 @@ class Samsara:
             self._routes = RoutesClient(client_wrapper=self._client_wrapper)
         return self._routes
 
-    @property
-    def safety(self):
-        if self._safety is None:
-            from .safety.client import SafetyClient  # noqa: E402
-
-            self._safety = SafetyClient(client_wrapper=self._client_wrapper)
-        return self._safety
-
     @property
     def settings(self):
         if self._settings is None:
@@ -504,6 +516,14 @@ class Samsara:
             self._route_events = RouteEventsClient(client_wrapper=self._client_wrapper)
         return self._route_events
 
+    @property
+    def safety(self):
+        if self._safety is None:
+            from .safety.client import SafetyClient  # noqa: E402
+
+            self._safety = SafetyClient(client_wrapper=self._client_wrapper)
+        return self._safety
+
     @property
     def speeding_intervals(self):
         if self._speeding_intervals is None:
@@ -520,6 +540,14 @@ class Samsara:
             self._tags = TagsClient(client_wrapper=self._client_wrapper)
         return self._tags
 
+    @property
+    def trips(self):
+        if self._trips is None:
+            from .trips.client import TripsClient  # noqa: E402
+
+            self._trips = TripsClient(client_wrapper=self._client_wrapper)
+        return self._trips
+
     @property
     def users(self):
         if self._users is None:
@@ -552,14 +580,6 @@ class Samsara:
             self._trailer_assignments = TrailerAssignmentsClient(client_wrapper=self._client_wrapper)
         return self._trailer_assignments
 
-    @property
-    def trips(self):
-        if self._trips is None:
-            from .trips.client import TripsClient  # noqa: E402
-
-            self._trips = TripsClient(client_wrapper=self._client_wrapper)
-        return self._trips
-
     @property
     def sensors(self):
         if self._sensors is None:
@@ -663,18 +683,19 @@ class AsyncSamsara:
         self._contacts: typing.Optional[AsyncContactsClient] = None
         self._maintenance: typing.Optional[AsyncMaintenanceClient] = None
         self._fuel_and_energy: typing.Optional[AsyncFuelAndEnergyClient] = None
+        self._driver_trailer_assignments: typing.Optional[AsyncDriverTrailerAssignmentsClient] = None
         self._driver_qr_codes: typing.Optional[AsyncDriverQrCodesClient] = None
         self._carrier_proposed_assignments: typing.Optional[AsyncCarrierProposedAssignmentsClient] = None
         self._legacy_ap_is: typing.Optional[AsyncLegacyApIsClient] = None
         self._documents: typing.Optional[AsyncDocumentsClient] = None
         self._driver_vehicle_assignments: typing.Optional[AsyncDriverVehicleAssignmentsClient] = None
         self._drivers: typing.Optional[AsyncDriversClient] = None
+        self._auth_token_for_driver: typing.Optional[AsyncAuthTokenForDriverClient] = None
         self._tachograph_eu_only: typing.Optional[AsyncTachographEuOnlyClient] = None
         self._equipment: typing.Optional[AsyncEquipmentClient] = None
         self._hours_of_service: typing.Optional[AsyncHoursOfServiceClient] = None
         self._ifta: typing.Optional[AsyncIftaClient] = None
         self._routes: typing.Optional[AsyncRoutesClient] = None
-        self._safety: typing.Optional[AsyncSafetyClient] = None
         self._settings: typing.Optional[AsyncSettingsClient] = None
         self._trailers: typing.Optional[AsyncTrailersClient] = None
         self._vehicles: typing.Optional[AsyncVehiclesClient] = None
@@ -692,13 +713,14 @@ class AsyncSamsara:
         self._organization_info: typing.Optional[AsyncOrganizationInfoClient] = None
         self._preview_ap_is: typing.Optional[AsyncPreviewApIsClient] = None
         self._route_events: typing.Optional[AsyncRouteEventsClient] = None
+        self._safety: typing.Optional[AsyncSafetyClient] = None
         self._speeding_intervals: typing.Optional[AsyncSpeedingIntervalsClient] = None
         self._tags: typing.Optional[AsyncTagsClient] = None
+        self._trips: typing.Optional[AsyncTripsClient] = None
         self._users: typing.Optional[AsyncUsersClient] = None
         self._legacy: typing.Optional[AsyncLegacyClient] = None
         self._messages: typing.Optional[AsyncMessagesClient] = None
         self._trailer_assignments: typing.Optional[AsyncTrailerAssignmentsClient] = None
-        self._trips: typing.Optional[AsyncTripsClient] = None
         self._sensors: typing.Optional[AsyncSensorsClient] = None
         self._webhooks: typing.Optional[AsyncWebhooksClient] = None
         self._fleet: typing.Optional[AsyncFleetClient] = None
@@ -791,6 +813,14 @@ class AsyncSamsara:
             self._fuel_and_energy = AsyncFuelAndEnergyClient(client_wrapper=self._client_wrapper)
         return self._fuel_and_energy
 
+    @property
+    def driver_trailer_assignments(self):
+        if self._driver_trailer_assignments is None:
+            from .driver_trailer_assignments.client import AsyncDriverTrailerAssignmentsClient  # noqa: E402
+
+            self._driver_trailer_assignments = AsyncDriverTrailerAssignmentsClient(client_wrapper=self._client_wrapper)
+        return self._driver_trailer_assignments
+
     @property
     def driver_qr_codes(self):
         if self._driver_qr_codes is None:
@@ -841,6 +871,14 @@ class AsyncSamsara:
             self._drivers = AsyncDriversClient(client_wrapper=self._client_wrapper)
         return self._drivers
 
+    @property
+    def auth_token_for_driver(self):
+        if self._auth_token_for_driver is None:
+            from .auth_token_for_driver.client import AsyncAuthTokenForDriverClient  # noqa: E402
+
+            self._auth_token_for_driver = AsyncAuthTokenForDriverClient(client_wrapper=self._client_wrapper)
+        return self._auth_token_for_driver
+
     @property
     def tachograph_eu_only(self):
         if self._tachograph_eu_only is None:
@@ -881,14 +919,6 @@ class AsyncSamsara:
             self._routes = AsyncRoutesClient(client_wrapper=self._client_wrapper)
         return self._routes
 
-    @property
-    def safety(self):
-        if self._safety is None:
-            from .safety.client import AsyncSafetyClient  # noqa: E402
-
-            self._safety = AsyncSafetyClient(client_wrapper=self._client_wrapper)
-        return self._safety
-
     @property
     def settings(self):
         if self._settings is None:
@@ -1025,6 +1055,14 @@ class AsyncSamsara:
             self._route_events = AsyncRouteEventsClient(client_wrapper=self._client_wrapper)
         return self._route_events
 
+    @property
+    def safety(self):
+        if self._safety is None:
+            from .safety.client import AsyncSafetyClient  # noqa: E402
+
+            self._safety = AsyncSafetyClient(client_wrapper=self._client_wrapper)
+        return self._safety
+
     @property
     def speeding_intervals(self):
         if self._speeding_intervals is None:
@@ -1041,6 +1079,14 @@ class AsyncSamsara:
             self._tags = AsyncTagsClient(client_wrapper=self._client_wrapper)
         return self._tags
 
+    @property
+    def trips(self):
+        if self._trips is None:
+            from .trips.client import AsyncTripsClient  # noqa: E402
+
+            self._trips = AsyncTripsClient(client_wrapper=self._client_wrapper)
+        return self._trips
+
     @property
     def users(self):
         if self._users is None:
@@ -1073,14 +1119,6 @@ class AsyncSamsara:
             self._trailer_assignments = AsyncTrailerAssignmentsClient(client_wrapper=self._client_wrapper)
         return self._trailer_assignments
 
-    @property
-    def trips(self):
-        if self._trips is None:
-            from .trips.client import AsyncTripsClient  # noqa: E402
-
-            self._trips = AsyncTripsClient(client_wrapper=self._client_wrapper)
-        return self._trips
-
     @property
     def sensors(self):
         if self._sensors is None:

samsara/core/client_wrapper.py

@@ -21,11 +21,15 @@ class BaseClientWrapper:
         self._timeout = timeout
 
     def get_headers(self) -> typing.Dict[str, str]:
+        import platform
+
         headers: typing.Dict[str, str] = {
-            "User-Agent": "samsara-api/4.3.0",
+            "User-Agent": "samsara-api/5.3.1",
             "X-Fern-Language": "Python",
+            "X-Fern-Runtime": f"python/{platform.python_version()}",
+            "X-Fern-Platform": f"{platform.system().lower()}/{platform.release()}",
             "X-Fern-SDK-Name": "samsara-api",
-            "X-Fern-SDK-Version": "4.3.0",
+            "X-Fern-SDK-Version": "5.3.1",
             **(self.get_custom_headers() or {}),
         }
         headers["Authorization"] = f"Bearer {self._get_token()}"

samsara/core/http_client.py

@@ -5,7 +5,6 @@ import email.utils
 import re
 import time
 import typing
-import urllib.parse
 from contextlib import asynccontextmanager, contextmanager
 from random import random
 
@@ -123,6 +122,30 @@ def _should_retry(response: httpx.Response) -> bool:
     return response.status_code >= 500 or response.status_code in retryable_400s
 
 
+def _build_url(base_url: str, path: typing.Optional[str]) -> str:
+    """
+    Build a full URL by joining a base URL with a path.
+
+    This function correctly handles base URLs that contain path prefixes (e.g., tenant-based URLs)
+    by using string concatenation instead of urllib.parse.urljoin(), which would incorrectly
+    strip path components when the path starts with '/'.
+
+    Example:
+        >>> _build_url("https://cloud.example.com/org/tenant/api", "/users")
+        'https://cloud.example.com/org/tenant/api/users'
+
+    Args:
+        base_url: The base URL, which may contain path prefixes.
+        path: The path to append. Can be None or empty string.
+
+    Returns:
+        The full URL with base_url and path properly joined.
+    """
+    if not path:
+        return base_url
+    return f"{base_url.rstrip('/')}/{path.lstrip('/')}"
+
+
 def _maybe_filter_none_from_multipart_data(
     data: typing.Optional[typing.Any],
     request_files: typing.Optional[RequestFiles],
@@ -192,8 +215,19 @@ def get_request_body(
         # If both data and json are None, we send json data in the event extra properties are specified
         json_body = maybe_filter_request_body(json, request_options, omit)
 
-    # If you have an empty JSON body, you should just send None
-    return (json_body if json_body != {} else None), data_body if data_body != {} else None
+    has_additional_body_parameters = bool(
+        request_options is not None and request_options.get("additional_body_parameters")
+    )
+
+    # Only collapse empty dict to None when the body was not explicitly provided
+    # and there are no additional body parameters. This preserves explicit empty
+    # bodies (e.g., when an endpoint has a request body type but all fields are optional).
+    if json_body == {} and json is None and not has_additional_body_parameters:
+        json_body = None
+    if data_body == {} and data is None and not has_additional_body_parameters:
+        data_body = None
+
+    return json_body, data_body
 
 
 class HttpClient:
@@ -283,7 +317,7 @@ class HttpClient:
 
         response = self.httpx_client.request(
             method=method,
-            url=urllib.parse.urljoin(f"{base_url}/", path),
+            url=_build_url(base_url, path),
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
@@ -386,7 +420,7 @@ class HttpClient:
 
         with self.httpx_client.stream(
             method=method,
-            url=urllib.parse.urljoin(f"{base_url}/", path),
+            url=_build_url(base_url, path),
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
@@ -504,7 +538,7 @@ class AsyncHttpClient:
         # Add the input to each of these and do None-safety checks
         response = await self.httpx_client.request(
             method=method,
-            url=urllib.parse.urljoin(f"{base_url}/", path),
+            url=_build_url(base_url, path),
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
@@ -609,7 +643,7 @@ class AsyncHttpClient:
 
         async with self.httpx_client.stream(
             method=method,
-            url=urllib.parse.urljoin(f"{base_url}/", path),
+            url=_build_url(base_url, path),
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {

samsara/core/jsonable_encoder.py

@@ -30,6 +30,10 @@ DictIntStrAny = Dict[Union[int, str], Any]
 
 def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any], Any]]] = None) -> Any:
     custom_encoder = custom_encoder or {}
+    # Generated SDKs use Ellipsis (`...`) as the sentinel value for "OMIT".
+    # OMIT values should be excluded from serialized payloads.
+    if obj is Ellipsis:
+        return None
     if custom_encoder:
         if type(obj) in custom_encoder:
             return custom_encoder[type(obj)](obj)
@@ -70,6 +74,8 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
         allowed_keys = set(obj.keys())
         for key, value in obj.items():
             if key in allowed_keys:
+                if value is Ellipsis:
+                    continue
                 encoded_key = jsonable_encoder(key, custom_encoder=custom_encoder)
                 encoded_value = jsonable_encoder(value, custom_encoder=custom_encoder)
                 encoded_dict[encoded_key] = encoded_value
@@ -77,6 +83,8 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
     if isinstance(obj, (list, set, frozenset, GeneratorType, tuple)):
         encoded_list = []
         for item in obj:
+            if item is Ellipsis:
+                continue
             encoded_list.append(jsonable_encoder(item, custom_encoder=custom_encoder))
         return encoded_list
 

samsara/core/pydantic_utilities.py

@@ -2,6 +2,7 @@
 
 # nopycln: file
 import datetime as dt
+import inspect
 from collections import defaultdict
 from typing import Any, Callable, ClassVar, Dict, List, Mapping, Optional, Set, Tuple, Type, TypeVar, Union, cast
 
@@ -37,7 +38,36 @@ Model = TypeVar("Model", bound=pydantic.BaseModel)
 
 
 def parse_obj_as(type_: Type[T], object_: Any) -> T:
-    dealiased_object = convert_and_respect_annotation_metadata(object_=object_, annotation=type_, direction="read")
+    # convert_and_respect_annotation_metadata is required for TypedDict aliasing.
+    #
+    # For Pydantic models, whether we should pre-dealias depends on how the model encodes aliasing:
+    # - If the model uses real Pydantic aliases (pydantic.Field(alias=...)), then we must pass wire keys through
+    #   unchanged so Pydantic can validate them.
+    # - If the model encodes aliasing only via FieldMetadata annotations, then we MUST pre-dealias because Pydantic
+    #   will not recognize those aliases during validation.
+    if inspect.isclass(type_) and issubclass(type_, pydantic.BaseModel):
+        has_pydantic_aliases = False
+        if IS_PYDANTIC_V2:
+            for field_name, field_info in getattr(type_, "model_fields", {}).items():  # type: ignore[attr-defined]
+                alias = getattr(field_info, "alias", None)
+                if alias is not None and alias != field_name:
+                    has_pydantic_aliases = True
+                    break
+        else:
+            for field in getattr(type_, "__fields__", {}).values():
+                alias = getattr(field, "alias", None)
+                name = getattr(field, "name", None)
+                if alias is not None and name is not None and alias != name:
+                    has_pydantic_aliases = True
+                    break
+
+        dealiased_object = (
+            object_
+            if has_pydantic_aliases
+            else convert_and_respect_annotation_metadata(object_=object_, annotation=type_, direction="read")
+        )
+    else:
+        dealiased_object = convert_and_respect_annotation_metadata(object_=object_, annotation=type_, direction="read")
     if IS_PYDANTIC_V2:
         adapter = pydantic.TypeAdapter(type_)  # type: ignore[attr-defined]
         return adapter.validate_python(dealiased_object)
@@ -59,6 +89,43 @@ class UniversalBaseModel(pydantic.BaseModel):
             protected_namespaces=(),
         )
 
+        @pydantic.model_validator(mode="before")  # type: ignore[attr-defined]
+        @classmethod
+        def _coerce_field_names_to_aliases(cls, data: Any) -> Any:
+            """
+            Accept Python field names in input by rewriting them to their Pydantic aliases,
+            while avoiding silent collisions when a key could refer to multiple fields.
+            """
+            if not isinstance(data, Mapping):
+                return data
+
+            fields = getattr(cls, "model_fields", {})  # type: ignore[attr-defined]
+            name_to_alias: Dict[str, str] = {}
+            alias_to_name: Dict[str, str] = {}
+
+            for name, field_info in fields.items():
+                alias = getattr(field_info, "alias", None) or name
+                name_to_alias[name] = alias
+                if alias != name:
+                    alias_to_name[alias] = name
+
+            # Detect ambiguous keys: a key that is an alias for one field and a name for another.
+            ambiguous_keys = set(alias_to_name.keys()).intersection(set(name_to_alias.keys()))
+            for key in ambiguous_keys:
+                if key in data and name_to_alias[key] not in data:
+                    raise ValueError(
+                        f"Ambiguous input key '{key}': it is both a field name and an alias. "
+                        "Provide the explicit alias key to disambiguate."
+                    )
+
+            original_keys = set(data.keys())
+            rewritten: Dict[str, Any] = dict(data)
+            for name, alias in name_to_alias.items():
+                if alias != name and name in original_keys and alias not in rewritten:
+                    rewritten[alias] = rewritten.pop(name)
+
+            return rewritten
+
         @pydantic.model_serializer(mode="plain", when_used="json")  # type: ignore[attr-defined]
         def serialize_model(self) -> Any:  # type: ignore[name-defined]
             serialized = self.dict()  # type: ignore[attr-defined]
@@ -71,6 +138,40 @@ class UniversalBaseModel(pydantic.BaseModel):
             smart_union = True
             json_encoders = {dt.datetime: serialize_datetime}
 
+        @pydantic.root_validator(pre=True)
+        def _coerce_field_names_to_aliases(cls, values: Any) -> Any:
+            """
+            Pydantic v1 equivalent of _coerce_field_names_to_aliases.
+            """
+            if not isinstance(values, Mapping):
+                return values
+
+            fields = getattr(cls, "__fields__", {})
+            name_to_alias: Dict[str, str] = {}
+            alias_to_name: Dict[str, str] = {}
+
+            for name, field in fields.items():
+                alias = getattr(field, "alias", None) or name
+                name_to_alias[name] = alias
+                if alias != name:
+                    alias_to_name[alias] = name
+
+            ambiguous_keys = set(alias_to_name.keys()).intersection(set(name_to_alias.keys()))
+            for key in ambiguous_keys:
+                if key in values and name_to_alias[key] not in values:
+                    raise ValueError(
+                        f"Ambiguous input key '{key}': it is both a field name and an alias. "
+                        "Provide the explicit alias key to disambiguate."
+                    )
+
+            original_keys = set(values.keys())
+            rewritten: Dict[str, Any] = dict(values)
+            for name, alias in name_to_alias.items():
+                if alias != name and name in original_keys and alias not in rewritten:
+                    rewritten[alias] = rewritten.pop(name)
+
+            return rewritten
+
     @classmethod
     def model_construct(cls: Type["Model"], _fields_set: Optional[Set[str]] = None, **values: Any) -> "Model":
         dealiased_object = convert_and_respect_annotation_metadata(object_=values, annotation=cls, direction="read")

samsara/{types/vehicle_location_time.py → driver_trailer_assignments/__init__.py}

@@ -1,5 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .time import Time
+# isort: skip_file
 
-VehicleLocationTime = Time