nv-ingest-api 2025.10.14.dev20251014__tar.gz → 2025.10.15.dev20251015__tar.gz

{nv_ingest_api-2025.10.14.dev20251014/src/nv_ingest_api.egg-info → nv_ingest_api-2025.10.15.dev20251015}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nv-ingest-api
-Version: 2025.10.14.dev20251014
+Version: 2025.10.15.dev20251015
 Summary: Python module with core document ingestion functions.
 Author-email: Jeremy Dyer <jdyer@nvidia.com>
 License:                                  Apache License

{nv_ingest_api-2025.10.14.dev20251014 → nv_ingest_api-2025.10.15.dev20251015}/src/nv_ingest_api/internal/schemas/meta/ingest_job_schema.py

@@ -32,6 +32,17 @@ class TracingOptionsSchema(BaseModelNoExt):
     total_pages: Optional[int] = None
 
 
+# PDF Configuration Schema
+class PdfConfigSchema(BaseModelNoExt):
+    """PDF-specific configuration options for job submission.
+
+    Note: split_page_count accepts any positive integer but will be clamped
+    to [1, 128] range by the server at runtime.
+    """
+
+    split_page_count: Annotated[int, Field(ge=1)] = 32
+
+
 # Ingest Task Schemas
 
 
@@ -270,6 +281,7 @@ class IngestJobSchema(BaseModelNoExt):
     job_id: Union[str, int]
     tasks: List[IngestTaskSchema]
     tracing_options: Optional[TracingOptionsSchema] = None
+    pdf_config: Optional[PdfConfigSchema] = None
 
 
 # ------------------------------------------------------------------------------

{nv_ingest_api-2025.10.14.dev20251014 → nv_ingest_api-2025.10.15.dev20251015}/src/nv_ingest_api/util/service_clients/rest/rest_client.py

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
-import os
 import re
 import time
 from typing import Any, Union, Tuple, Optional, Dict, Callable
@@ -104,6 +103,17 @@ class RestClient(MessageBrokerClientBase):
             Default timeout in seconds for waiting for data after connection. Default is None.
         http_allocator : Optional[Callable[[], Any]], optional
             A callable that returns an HTTP client instance. If None, `requests.Session()` is used.
+        **kwargs : dict
+            Additional keyword arguments. Supported keys:
+            - api_version : str, optional
+                API version to use ('v1' or 'v2'). Defaults to 'v1' if not specified.
+                Invalid versions will log a warning and fall back to 'v1'.
+            - base_url : str, optional
+                Override the generated base URL.
+            - headers : dict, optional
+                Additional headers to include in requests.
+            - auth : optional
+                Authentication configuration for requests.
 
         Returns
         -------
@@ -138,8 +148,19 @@ class RestClient(MessageBrokerClientBase):
                 )
                 self._client = requests.Session()
 
-        # Allow API version override via environment variable or kwargs
-        api_version = kwargs.get("api_version") or os.getenv("NV_INGEST_API_VERSION", "v1")
+        # Validate and normalize API version to prevent misconfiguration
+        # Default to v1 for backwards compatibility if not explicitly provided
+        VALID_API_VERSIONS = {"v1", "v2"}
+        raw_api_version = kwargs.get("api_version", "v1")
+        api_version = str(raw_api_version).strip().lower()
+
+        if api_version not in VALID_API_VERSIONS:
+            logger.warning(
+                f"Invalid API version '{raw_api_version}' specified. "
+                f"Valid versions are: {VALID_API_VERSIONS}. Falling back to 'v1'."
+            )
+            api_version = "v1"
+
         self._api_version = api_version
         self._submit_endpoint: str = f"/{api_version}/submit_job"
         self._fetch_endpoint: str = f"/{api_version}/fetch_job"

nv_ingest_api-2025.10.15.dev20251015/src/nv_ingest_api/util/string_processing/yaml.py

@@ -0,0 +1,82 @@
+import os
+import re
+from typing import Optional
+
+# This regex finds all forms of environment variables:
+# $VAR, ${VAR}, $VAR|default, and ${VAR|default}
+# It avoids matching escaped variables like $$.
+# Default values can be quoted or unquoted.
+_ENV_VAR_PATTERN = re.compile(
+    r"""(?<!\$)\$(?:
+        {(?P<braced>\w+)(?:\|(?P<braced_default>[^}]+))?}
+        |
+        (?P<named>\w+)(?:\|(?P<named_default>"[^"\\]*(?:\\.[^"\\]*)*"|'[^'\\]*(?:\\.[^'\\]*)*'|\S+))?
+    )""",
+    re.VERBOSE,
+)
+
+
+def _replacer(match: re.Match) -> str:
+    """Replaces a regex match with the corresponding environment variable."""
+    var_name = match.group("braced") or match.group("named")
+    default_val = match.group("braced_default") or match.group("named_default")
+
+    # First try the primary env var
+    value = os.environ.get(var_name)
+    if value is not None:
+        return value
+
+    # If primary is missing, try the default.
+    resolved_default = _resolve_default_with_single_fallback(default_val)
+
+    if resolved_default is None:
+        return ""
+
+    return resolved_default
+
+
+def _is_var_ref(token: str) -> Optional[str]:
+    """If token is a $VAR or ${VAR} reference, return VAR name; else None."""
+    if not token:
+        return None
+    if token.startswith("${") and token.endswith("}"):
+        inner = token[2:-1]
+        return inner if re.fullmatch(r"\w+", inner) else None
+    if token.startswith("$"):
+        inner = token[1:]
+        return inner if re.fullmatch(r"\w+", inner) else None
+    return None
+
+
+def _resolve_default_with_single_fallback(default_val: Optional[str]) -> Optional[str]:
+    """
+    Support a single-level fallback where the default itself can be another env var.
+    For example, in $A|$B or ${A|$B}, we try B if A missing.
+    """
+    if default_val is None:
+        return None
+
+    var = _is_var_ref(default_val)
+    if var is not None:
+        return os.environ.get(var, None)
+
+    return default_val
+
+
+def substitute_env_vars_in_yaml_content(raw_content: str) -> str:
+    """
+    Substitutes environment variables in a YAML string.
+
+    This function finds all occurrences of environment variable placeholders
+    ($VAR, ${VAR}, $VAR|default, ${VAR|default}) in the input string
+    and replaces them with their corresponding environment variable values.
+    Also supports a single fallback to another env var: $VAR|$OTHER, ${VAR|$OTHER}
+    Quoted defaults are preserved EXACTLY as written (e.g., 'a,b' keeps quotes).
+
+    Args:
+        raw_content: The raw string content of a YAML file.
+
+    Returns:
+        The YAML string with environment variables substituted.
+    """
+    return _ENV_VAR_PATTERN.sub(_replacer, raw_content)

{nv_ingest_api-2025.10.14.dev20251014 → nv_ingest_api-2025.10.15.dev20251015/src/nv_ingest_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nv-ingest-api
-Version: 2025.10.14.dev20251014
+Version: 2025.10.15.dev20251015
 Summary: Python module with core document ingestion functions.
 Author-email: Jeremy Dyer <jdyer@nvidia.com>
 License:                                  Apache License

nv_ingest_api-2025.10.14.dev20251014/src/nv_ingest_api/util/string_processing/yaml.py

@@ -1,45 +0,0 @@
-import os
-import re
-
-# This regex finds all forms of environment variables:
-# $VAR, ${VAR}, $VAR|default, and ${VAR|default}
-# It avoids matching escaped variables like $$.
-# Default values can be quoted or unquoted.
-_ENV_VAR_PATTERN = re.compile(
-    r"""(?<!\$)\$(?:
-        {(?P<braced>\w+)(?:\|(?P<braced_default>[^}]+))?}
-        |
-        (?P<named>\w+)(?:\|(?P<named_default>"[^"\\]*(?:\\.[^"\\]*)*"|'[^'\\]*(?:\\.[^'\\]*)*'|\S+))?
-    )""",
-    re.VERBOSE,
-)
-
-
-def _replacer(match: re.Match) -> str:
-    """Replaces a regex match with the corresponding environment variable."""
-    var_name = match.group("braced") or match.group("named")
-    default_val = match.group("braced_default") or match.group("named_default")
-
-    # Get value from environment, or use default.
-    value = os.environ.get(var_name, default_val)
-
-    if value is None:
-        return ""
-    return value
-
-
-def substitute_env_vars_in_yaml_content(raw_content: str) -> str:
-    """
-    Substitutes environment variables in a YAML string.
-
-    This function finds all occurrences of environment variable placeholders
-    ($VAR, ${VAR}, $VAR|default, ${VAR|default}) in the input string
-    and replaces them with their corresponding environment variable values.
-
-    Args:
-        raw_content: The raw string content of a YAML file.
-
-    Returns:
-        The YAML string with environment variables substituted.
-    """
-    return _ENV_VAR_PATTERN.sub(_replacer, raw_content)