label-studio-sdk 1.0.7__py3-none-any.whl → 1.0.10__py3-none-any.whl

label_studio_sdk/converter/converter.py

@@ -10,7 +10,6 @@ from copy import deepcopy
 from datetime import datetime
 from enum import Enum
 from glob import glob
-from operator import itemgetter
 from shutil import copy2
 from typing import Optional
 
@@ -34,6 +33,7 @@ from label_studio_sdk.converter.utils import (
     convert_annotation_to_yolo,
     convert_annotation_to_yolo_obb,
 )
+from label_studio_sdk._extensions.label_studio_tools.core.utils.io import get_local_path
 
 logger = logging.getLogger(__name__)
 
@@ -56,6 +56,9 @@ class Format(Enum):
     YOLO = 11
     YOLO_OBB = 12
     CSV_OLD = 13
+    YOLO_WITH_IMAGES = 14
+    COCO_WITH_IMAGES = 15
+    YOLO_OBB_WITH_IMAGES = 16
 
     def __str__(self):
         return self.name
@@ -107,6 +110,12 @@ class Converter(object):
             "link": "https://labelstud.io/guide/export.html#COCO",
             "tags": ["image segmentation", "object detection"],
         },
+        Format.COCO_WITH_IMAGES: {
+            "title": "COCO with Images",
+            "description": "COCO format with images downloaded.",
+            "link": "https://labelstud.io/guide/export.html#COCO",
+            "tags": ["image segmentation", "object detection"],
+        },
         Format.VOC: {
             "title": "Pascal VOC XML",
             "description": "Popular XML format used for object detection and polygon image segmentation tasks.",
@@ -120,6 +129,12 @@ class Converter(object):
             "link": "https://labelstud.io/guide/export.html#YOLO",
             "tags": ["image segmentation", "object detection"],
         },
+        Format.YOLO_WITH_IMAGES: {
+            "title": "YOLO with Images",
+            "description": "YOLO format with images downloaded.",
+            "link": "https://labelstud.io/guide/export.html#YOLO",
+            "tags": ["image segmentation", "object detection"],
+        },
         Format.YOLO_OBB: {
             "title": "YOLOv8 OBB",
             "description": "Popular TXT format is created for each image file. Each txt file contains annotations for "
@@ -128,6 +143,12 @@ class Converter(object):
             "link": "https://labelstud.io/guide/export.html#YOLO",
             "tags": ["image segmentation", "object detection"],
         },
+        Format.YOLO_OBB_WITH_IMAGES: {
+            "title": "YOLOv8 OBB with Images",
+            "description": "YOLOv8 OBB format with images downloaded.",
+            "link": "https://labelstud.io/guide/export.html#YOLO",
+            "tags": ["image segmentation", "object detection"],
+        },
         Format.BRUSH_TO_NUMPY: {
             "title": "Brush labels to NumPy",
             "description": "Export your brush labels as NumPy 2d arrays. Each label outputs as one image.",
@@ -159,6 +180,8 @@ class Converter(object):
         output_tags=None,
         upload_dir=None,
         download_resources=True,
+        access_token=None,
+        hostname=None,
     ):
         """Initialize Label Studio Converter for Exports
 
@@ -172,6 +195,8 @@ class Converter(object):
         self.upload_dir = upload_dir
         self.download_resources = download_resources
         self._schema = None
+        self.access_token = access_token
+        self.hostname = hostname
 
         if isinstance(config, dict):
             self._schema = config
@@ -217,21 +242,23 @@ class Converter(object):
             )
         elif format == Format.CONLL2003:
             self.convert_to_conll2003(input_data, output_data, is_dir=is_dir)
-        elif format == Format.COCO:
+        elif format in [Format.COCO, Format.COCO_WITH_IMAGES]:
             image_dir = kwargs.get("image_dir")
+            self.download_resources = format == Format.COCO_WITH_IMAGES
             self.convert_to_coco(
                 input_data, output_data, output_image_dir=image_dir, is_dir=is_dir
             )
-        elif format == Format.YOLO or format == Format.YOLO_OBB:
+        elif format in [Format.YOLO, Format.YOLO_OBB, Format.YOLO_OBB_WITH_IMAGES, Format.YOLO_WITH_IMAGES]:
             image_dir = kwargs.get("image_dir")
             label_dir = kwargs.get("label_dir")
+            self.download_resources = format in [Format.YOLO_WITH_IMAGES, Format.YOLO_OBB_WITH_IMAGES]
             self.convert_to_yolo(
                 input_data,
                 output_data,
                 output_image_dir=image_dir,
                 output_label_dir=label_dir,
                 is_dir=is_dir,
-                is_obb=(format == Format.YOLO_OBB),
+                is_obb=(format in [Format.YOLO_OBB, Format.YOLO_OBB_WITH_IMAGES]),
             )
         elif format == Format.VOC:
             image_dir = kwargs.get("image_dir")
@@ -282,12 +309,16 @@ class Converter(object):
         for name, info in self._schema.items():
             if output_tags is not None and name not in output_tags:
                 continue
-            data_keys |= set(map(itemgetter("value"), info["inputs"]))
+            for input_tag in info["inputs"]:
+                for value_key_name in ["value", "valueList"]:
+                    if value_key_name in input_tag:
+                        data_keys.add(input_tag[value_key_name])
             output_tag_names.append(name)
 
         return list(data_keys), output_tag_names
 
     def _get_supported_formats(self):
+        is_mig = False
         if len(self._data_keys) > 1:
             return [
                 Format.JSON.name,
@@ -300,6 +331,8 @@ class Converter(object):
         for info in self._schema.values():
             output_tag_types.add(info["type"])
             for input_tag in info["inputs"]:
+                if input_tag.get("valueList"):
+                    is_mig = True
                 if input_tag["type"] == "Text" and input_tag.get("valueType") == "url":
                     logger.error('valueType="url" are not supported for text inputs')
                     continue
@@ -308,7 +341,7 @@ class Converter(object):
         all_formats = [f.name for f in Format]
         if not ("Text" in input_tag_types and "Labels" in output_tag_types):
             all_formats.remove(Format.CONLL2003.name)
-        if not (
+        if is_mig or not (
             "Image" in input_tag_types
             and (
                 "RectangleLabels" in output_tag_types
@@ -317,7 +350,7 @@ class Converter(object):
             )
         ):
             all_formats.remove(Format.VOC.name)
-        if not (
+        if is_mig or not (
             "Image" in input_tag_types
             and (
                 "RectangleLabels" in output_tag_types
@@ -329,7 +362,9 @@ class Converter(object):
             and "Labels" in output_tag_types
         ):
             all_formats.remove(Format.COCO.name)
+            all_formats.remove(Format.COCO_WITH_IMAGES.name)
             all_formats.remove(Format.YOLO.name)
+            all_formats.remove(Format.YOLO_WITH_IMAGES.name)
         if not (
             "Image" in input_tag_types
             and (
@@ -346,8 +381,9 @@ class Converter(object):
             and "TextArea" in output_tag_types
         ):
             all_formats.remove(Format.ASR_MANIFEST.name)
-        if 'Video' in input_tag_types and 'TimelineLabels' in output_tag_types:
+        if is_mig or ('Video' in input_tag_types and 'TimelineLabels' in output_tag_types):
             all_formats.remove(Format.YOLO_OBB.name)
+            all_formats.remove(Format.YOLO_OBB_WITH_IMAGES.name)
 
         return all_formats
 
@@ -588,20 +624,25 @@ class Converter(object):
         )
         for item_idx, item in enumerate(item_iterator):
             image_path = item["input"][data_key]
+            task_id = item["id"]
             image_id = len(images)
             width = None
             height = None
             # download all images of the dataset, including the ones without annotations
             if not os.path.exists(image_path):
                 try:
-                    image_path = download(
-                        image_path,
-                        output_image_dir,
+                    image_path = get_local_path(
+                        url=image_path,
+                        hostname=self.hostname,
                         project_dir=self.project_dir,
-                        return_relative_path=True,
-                        upload_dir=self.upload_dir,
+                        image_dir=self.upload_dir,
+                        cache_dir=output_image_dir,
                         download_resources=self.download_resources,
+                        access_token=self.access_token,
+                        task_id=task_id,
                     )
+                    # make path relative to output_image_dir
+                    image_path = os.path.relpath(image_path, output_dir)
                 except:
                     logger.info(
                         "Unable to download {image_path}. The image of {item} will be skipped".format(
@@ -796,19 +837,24 @@ class Converter(object):
             image_paths = [image_paths] if isinstance(image_paths, str) else image_paths
             # download image(s)
             image_path = None
+            task_id = item["id"]
             # TODO: for multi-page annotation, this code won't produce correct relationships between page and annotated shapes
             # fixing the issue in RND-84
             for image_path in reversed(image_paths):
                 if not os.path.exists(image_path):
                     try:
-                        image_path = download(
-                            image_path,
-                            output_image_dir,
+                        image_path = get_local_path(
+                            url=image_path,
+                            hostname=self.hostname,
                             project_dir=self.project_dir,
-                            return_relative_path=True,
-                            upload_dir=self.upload_dir,
+                            image_dir=self.upload_dir,
+                            cache_dir=output_image_dir,
                             download_resources=self.download_resources,
+                            access_token=self.access_token,
+                            task_id=task_id,
                         )
+                        # make path relative to output_image_dir
+                        image_path = os.path.relpath(image_path, output_dir)
                     except:
                         logger.info(
                             "Unable to download {image_path}. The item {item} will be skipped".format(
@@ -915,6 +961,8 @@ class Converter(object):
                             annotations.append([category_id, x, y, w, h])
 
                     elif "polygonlabels" in label or "polygon" in label:
+                        if not ('points' in label):
+                            continue
                         points_abs = [(x / 100, y / 100) for x, y in label["points"]]
                         annotations.append(
                             [category_id]

label_studio_sdk/converter/imports/yolo.py

@@ -218,7 +218,7 @@ def add_parser(subparsers):
         "--image-ext",
         dest="image_ext",
         help="image extension to search: .jpeg or .jpg, .png",
-        default=".jpg",
+        default=".jpg,jpeg,.png",
     )
     yolo.add_argument(
         "--image-dims",

label_studio_sdk/converter/utils.py

@@ -21,6 +21,7 @@ from lxml import etree
 from nltk.tokenize.treebank import TreebankWordTokenizer
 
 from label_studio_sdk._extensions.label_studio_tools.core.utils.params import get_env
+from label_studio_sdk._extensions.label_studio_tools.core.utils.io import safe_build_path
 
 logger = logging.getLogger(__name__)
 
@@ -148,7 +149,7 @@ def download(
     if is_uploaded_file:
         upload_dir = _get_upload_dir(project_dir, upload_dir)
         filename = urllib.parse.unquote(url.replace("/data/upload/", ""))
-        filepath = os.path.join(upload_dir, filename)
+        filepath = safe_build_path(upload_dir, filename)
         logger.debug(
             f"Copy {filepath} to {output_dir}".format(
                 filepath=filepath, output_dir=output_dir
@@ -165,7 +166,7 @@ def download(
     if is_local_file:
         filename, dir_path = url.split("/data/", 1)[-1].split("?d=")
         dir_path = str(urllib.parse.unquote(dir_path))
-        filepath = os.path.join(LOCAL_FILES_DOCUMENT_ROOT, dir_path)
+        filepath = safe_build_path(LOCAL_FILES_DOCUMENT_ROOT, dir_path)
         if not os.path.exists(filepath):
             raise FileNotFoundError(filepath)
         if download_resources:

label_studio_sdk/core/__init__.py

@@ -3,14 +3,23 @@
 from .api_error import ApiError
 from .client_wrapper import AsyncClientWrapper, BaseClientWrapper, SyncClientWrapper
 from .datetime_utils import serialize_datetime
-from .file import File, convert_file_dict_to_httpx_tuples
+from .file import File, convert_file_dict_to_httpx_tuples, with_content_type
 from .http_client import AsyncHttpClient, HttpClient
 from .jsonable_encoder import jsonable_encoder
 from .pagination import AsyncPager, SyncPager
-from .pydantic_utilities import deep_union_pydantic_dicts, pydantic_v1
+from .pydantic_utilities import (
+    IS_PYDANTIC_V2,
+    UniversalBaseModel,
+    UniversalRootModel,
+    parse_obj_as,
+    universal_field_validator,
+    universal_root_validator,
+    update_forward_refs,
+)
 from .query_encoder import encode_query
 from .remove_none_from_dict import remove_none_from_dict
 from .request_options import RequestOptions
+from .serialization import FieldMetadata, convert_and_respect_annotation_metadata
 
 __all__ = [
     "ApiError",
@@ -18,16 +27,24 @@ __all__ = [
     "AsyncHttpClient",
     "AsyncPager",
     "BaseClientWrapper",
+    "FieldMetadata",
     "File",
     "HttpClient",
+    "IS_PYDANTIC_V2",
     "RequestOptions",
     "SyncClientWrapper",
     "SyncPager",
+    "UniversalBaseModel",
+    "UniversalRootModel",
+    "convert_and_respect_annotation_metadata",
     "convert_file_dict_to_httpx_tuples",
-    "deep_union_pydantic_dicts",
     "encode_query",
     "jsonable_encoder",
-    "pydantic_v1",
+    "parse_obj_as",
     "remove_none_from_dict",
     "serialize_datetime",
+    "universal_field_validator",
+    "universal_root_validator",
+    "update_forward_refs",
+    "with_content_type",
 ]

label_studio_sdk/core/client_wrapper.py

@@ -1,10 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-
 import httpx
-
-from .http_client import AsyncHttpClient, HttpClient
+from .http_client import HttpClient
+from .http_client import AsyncHttpClient
 
 
 class BaseClientWrapper:
@@ -17,7 +16,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "label-studio-sdk",
-            "X-Fern-SDK-Version": "1.0.6",
+            "X-Fern-SDK-Version": "1.0.9",
         }
         headers["Authorization"] = f"Token  {self.api_key}"
         return headers
@@ -36,9 +35,9 @@ class SyncClientWrapper(BaseClientWrapper):
         super().__init__(api_key=api_key, base_url=base_url, timeout=timeout)
         self.httpx_client = HttpClient(
             httpx_client=httpx_client,
-            base_headers=self.get_headers(),
-            base_timeout=self.get_timeout(),
-            base_url=self.get_base_url(),
+            base_headers=self.get_headers,
+            base_timeout=self.get_timeout,
+            base_url=self.get_base_url,
         )
 
 
@@ -49,7 +48,7 @@ class AsyncClientWrapper(BaseClientWrapper):
         super().__init__(api_key=api_key, base_url=base_url, timeout=timeout)
         self.httpx_client = AsyncHttpClient(
             httpx_client=httpx_client,
-            base_headers=self.get_headers(),
-            base_timeout=self.get_timeout(),
-            base_url=self.get_base_url(),
+            base_headers=self.get_headers,
+            base_timeout=self.get_timeout,
+            base_url=self.get_base_url,
         )

label_studio_sdk/core/file.py

@@ -1,25 +1,30 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
+from typing import IO, Dict, List, Mapping, Optional, Tuple, Union, cast
 
 # File typing inspired by the flexibility of types within the httpx library
 # https://github.com/encode/httpx/blob/master/httpx/_types.py
-FileContent = typing.Union[typing.IO[bytes], bytes, str]
-File = typing.Union[
+FileContent = Union[IO[bytes], bytes, str]
+File = Union[
     # file (or bytes)
     FileContent,
     # (filename, file (or bytes))
-    typing.Tuple[typing.Optional[str], FileContent],
+    Tuple[Optional[str], FileContent],
     # (filename, file (or bytes), content_type)
-    typing.Tuple[typing.Optional[str], FileContent, typing.Optional[str]],
+    Tuple[Optional[str], FileContent, Optional[str]],
     # (filename, file (or bytes), content_type, headers)
-    typing.Tuple[typing.Optional[str], FileContent, typing.Optional[str], typing.Mapping[str, str]],
+    Tuple[
+        Optional[str],
+        FileContent,
+        Optional[str],
+        Mapping[str, str],
+    ],
 ]
 
 
 def convert_file_dict_to_httpx_tuples(
-    d: typing.Dict[str, typing.Union[File, typing.List[File]]]
-) -> typing.List[typing.Tuple[str, File]]:
+    d: Dict[str, Union[File, List[File]]],
+) -> List[Tuple[str, File]]:
     """
     The format we use is a list of tuples, where the first element is the
     name of the file and the second is the file object. Typically HTTPX wants
@@ -36,3 +41,27 @@ def convert_file_dict_to_httpx_tuples(
         else:
             httpx_tuples.append((key, file_like))
     return httpx_tuples
+
+
+def with_content_type(*, file: File, default_content_type: str) -> File:
+    """
+    This function resolves to the file's content type, if provided, and defaults
+    to the default_content_type value if not.
+    """
+    if isinstance(file, tuple):
+        if len(file) == 2:
+            filename, content = cast(Tuple[Optional[str], FileContent], file)  # type: ignore
+            return (filename, content, default_content_type)
+        elif len(file) == 3:
+            filename, content, file_content_type = cast(Tuple[Optional[str], FileContent, Optional[str]], file)  # type: ignore
+            out_content_type = file_content_type or default_content_type
+            return (filename, content, out_content_type)
+        elif len(file) == 4:
+            filename, content, file_content_type, headers = cast(  # type: ignore
+                Tuple[Optional[str], FileContent, Optional[str], Mapping[str, str]], file
+            )
+            out_content_type = file_content_type or default_content_type
+            return (filename, content, out_content_type, headers)
+        else:
+            raise ValueError(f"Unexpected tuple length: {len(file)}")
+    return (None, file, default_content_type)

label_studio_sdk/core/http_client.py

@@ -90,7 +90,8 @@ def _should_retry(response: httpx.Response) -> bool:
 
 
 def remove_omit_from_dict(
-    original: typing.Dict[str, typing.Optional[typing.Any]], omit: typing.Optional[typing.Any]
+    original: typing.Dict[str, typing.Optional[typing.Any]],
+    omit: typing.Optional[typing.Any],
 ) -> typing.Dict[str, typing.Any]:
     if omit is None:
         return original
@@ -108,7 +109,7 @@ def maybe_filter_request_body(
 ) -> typing.Optional[typing.Any]:
     if data is None:
         return (
-            jsonable_encoder(request_options.get("additional_body_parameters", {}))
+            jsonable_encoder(request_options.get("additional_body_parameters", {})) or {}
             if request_options is not None
             else None
         )
@@ -118,7 +119,7 @@ def maybe_filter_request_body(
         data_content = {
             **(jsonable_encoder(remove_omit_from_dict(data, omit))),  # type: ignore
             **(
-                jsonable_encoder(request_options.get("additional_body_parameters", {}))
+                jsonable_encoder(request_options.get("additional_body_parameters", {})) or {}
                 if request_options is not None
                 else {}
             ),
@@ -142,7 +143,8 @@ 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)
 
-    return json_body, data_body
+    # 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
 
 
 class HttpClient:
@@ -150,9 +152,9 @@ class HttpClient:
         self,
         *,
         httpx_client: httpx.Client,
-        base_timeout: typing.Optional[float],
-        base_headers: typing.Dict[str, str],
-        base_url: typing.Optional[str] = None,
+        base_timeout: typing.Callable[[], typing.Optional[float]],
+        base_headers: typing.Callable[[], typing.Dict[str, str]],
+        base_url: typing.Optional[typing.Callable[[], str]] = None,
     ):
         self.base_url = base_url
         self.base_timeout = base_timeout
@@ -160,7 +162,10 @@ class HttpClient:
         self.httpx_client = httpx_client
 
     def get_base_url(self, maybe_base_url: typing.Optional[str]) -> str:
-        base_url = self.base_url if maybe_base_url is None else maybe_base_url
+        base_url = maybe_base_url
+        if self.base_url is not None and base_url is None:
+            base_url = self.base_url()
+
         if base_url is None:
             raise ValueError("A base_url is required to make this request, please provide one and try again.")
         return base_url
@@ -185,7 +190,7 @@ class HttpClient:
         timeout = (
             request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
@@ -196,9 +201,9 @@ class HttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
+                        **(request_options.get("additional_headers", {}) or {} if request_options is not None else {}),
                     }
                 )
             ),
@@ -209,7 +214,7 @@ class HttpClient:
                             {
                                 **(params if params is not None else {}),
                                 **(
-                                    request_options.get("additional_query_parameters", {})
+                                    request_options.get("additional_query_parameters", {}) or {}
                                     if request_options is not None
                                     else {}
                                 ),
@@ -222,7 +227,11 @@ class HttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files)) if files is not None else None,
+            files=(
+                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+                if (files is not None and files is not omit)
+                else None
+            ),
             timeout=timeout,
         )
 
@@ -267,7 +276,7 @@ class HttpClient:
         timeout = (
             request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
@@ -278,7 +287,7 @@ class HttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
                         **(request_options.get("additional_headers", {}) if request_options is not None else {}),
                     }
@@ -304,7 +313,11 @@ class HttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files)) if files is not None else None,
+            files=(
+                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+                if (files is not None and files is not omit)
+                else None
+            ),
             timeout=timeout,
         ) as stream:
             yield stream
@@ -315,9 +328,9 @@ class AsyncHttpClient:
         self,
         *,
         httpx_client: httpx.AsyncClient,
-        base_timeout: typing.Optional[float],
-        base_headers: typing.Dict[str, str],
-        base_url: typing.Optional[str] = None,
+        base_timeout: typing.Callable[[], typing.Optional[float]],
+        base_headers: typing.Callable[[], typing.Dict[str, str]],
+        base_url: typing.Optional[typing.Callable[[], str]] = None,
     ):
         self.base_url = base_url
         self.base_timeout = base_timeout
@@ -325,7 +338,10 @@ class AsyncHttpClient:
         self.httpx_client = httpx_client
 
     def get_base_url(self, maybe_base_url: typing.Optional[str]) -> str:
-        base_url = self.base_url if maybe_base_url is None else maybe_base_url
+        base_url = maybe_base_url
+        if self.base_url is not None and base_url is None:
+            base_url = self.base_url()
+
         if base_url is None:
             raise ValueError("A base_url is required to make this request, please provide one and try again.")
         return base_url
@@ -350,7 +366,7 @@ class AsyncHttpClient:
         timeout = (
             request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
@@ -362,9 +378,9 @@ class AsyncHttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
+                        **(request_options.get("additional_headers", {}) or {} if request_options is not None else {}),
                     }
                 )
             ),
@@ -375,7 +391,7 @@ class AsyncHttpClient:
                             {
                                 **(params if params is not None else {}),
                                 **(
-                                    request_options.get("additional_query_parameters", {})
+                                    request_options.get("additional_query_parameters", {}) or {}
                                     if request_options is not None
                                     else {}
                                 ),
@@ -388,7 +404,11 @@ class AsyncHttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files)) if files is not None else None,
+            files=(
+                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+                if files is not None
+                else None
+            ),
             timeout=timeout,
         )
 
@@ -432,7 +452,7 @@ class AsyncHttpClient:
         timeout = (
             request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
@@ -443,7 +463,7 @@ class AsyncHttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
                         **(request_options.get("additional_headers", {}) if request_options is not None else {}),
                     }
@@ -469,7 +489,11 @@ class AsyncHttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files)) if files is not None else None,
+            files=(
+                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+                if files is not None
+                else None
+            ),
             timeout=timeout,
         ) as stream:
             yield stream