sift-stack-py 0.17.1__tar.gz → 0.18.0__tar.gz

{sift_stack_py-0.17.1 → sift_stack_py-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sift_stack_py
-Version: 0.17.1
+Version: 0.18.0
 Summary: Python client library for the Sift API
 Maintainer-email: Sift Software Engineers <engineering@siftstack.com>
 License: Copyright (c) 2024 Azimuth Industries Inc.
@@ -46,6 +46,7 @@ Requires-Dist: types-requests~=2.25
 Requires-Dist: googleapis-common-protos>=1.60
 Requires-Dist: protoc-gen-openapiv2>=0.0.1
 Requires-Dist: filelock~=3.15
+Requires-Dist: tomli~=2.0; python_version < "3.11"
 Provides-Extra: all
 Requires-Dist: cffi~=1.14; extra == "all"
 Requires-Dist: h5py~=3.11; extra == "all"
@@ -54,7 +55,7 @@ Requires-Dist: polars~=1.8; extra == "all"
 Requires-Dist: pyOpenSSL<24.0.0; extra == "all"
 Requires-Dist: pyarrow>=17.0.0; extra == "all"
 Requires-Dist: rosbags~=0.0; python_full_version >= "3.8.2" and extra == "all"
-Requires-Dist: sift-stream-bindings==0.3.0; extra == "all"
+Requires-Dist: sift-stream-bindings==0.4.1; extra == "all"
 Requires-Dist: types-pyOpenSSL<24.0.0; extra == "all"
 Provides-Extra: build
 Requires-Dist: build==1.2.1; extra == "build"
@@ -69,6 +70,7 @@ Requires-Dist: pytest-asyncio==0.23.7; extra == "dev"
 Requires-Dist: pytest-benchmark==4.0.0; extra == "dev"
 Requires-Dist: pytest-dotenv==0.5.2; extra == "dev"
 Requires-Dist: pytest-mock==3.14.0; extra == "dev"
+Requires-Dist: pytest-randomly==3.15.0; extra == "dev"
 Requires-Dist: pytest==8.2.2; extra == "dev"
 Requires-Dist: ruff~=0.12.10; extra == "dev"
 Requires-Dist: tomlkit~=0.13.3; extra == "dev"
@@ -88,10 +90,11 @@ Requires-Dist: pytest-asyncio==0.23.7; extra == "dev-all"
 Requires-Dist: pytest-benchmark==4.0.0; extra == "dev-all"
 Requires-Dist: pytest-dotenv==0.5.2; extra == "dev-all"
 Requires-Dist: pytest-mock==3.14.0; extra == "dev-all"
+Requires-Dist: pytest-randomly==3.15.0; extra == "dev-all"
 Requires-Dist: pytest==8.2.2; extra == "dev-all"
 Requires-Dist: rosbags~=0.0; python_full_version >= "3.8.2" and extra == "dev-all"
 Requires-Dist: ruff~=0.12.10; extra == "dev-all"
-Requires-Dist: sift-stream-bindings==0.3.0; extra == "dev-all"
+Requires-Dist: sift-stream-bindings==0.4.1; extra == "dev-all"
 Requires-Dist: tomlkit~=0.13.3; extra == "dev-all"
 Requires-Dist: types-pyOpenSSL<24.0.0; extra == "dev-all"
 Provides-Extra: development
@@ -102,6 +105,7 @@ Requires-Dist: pytest-asyncio==0.23.7; extra == "development"
 Requires-Dist: pytest-benchmark==4.0.0; extra == "development"
 Requires-Dist: pytest-dotenv==0.5.2; extra == "development"
 Requires-Dist: pytest-mock==3.14.0; extra == "development"
+Requires-Dist: pytest-randomly==3.15.0; extra == "development"
 Requires-Dist: pytest==8.2.2; extra == "development"
 Requires-Dist: ruff~=0.12.10; extra == "development"
 Requires-Dist: tomlkit~=0.13.3; extra == "development"
@@ -138,10 +142,11 @@ Requires-Dist: pytest-asyncio==0.23.7; extra == "docs-build"
 Requires-Dist: pytest-benchmark==4.0.0; extra == "docs-build"
 Requires-Dist: pytest-dotenv==0.5.2; extra == "docs-build"
 Requires-Dist: pytest-mock==3.14.0; extra == "docs-build"
+Requires-Dist: pytest-randomly==3.15.0; extra == "docs-build"
 Requires-Dist: pytest==8.2.2; extra == "docs-build"
 Requires-Dist: rosbags~=0.0; python_full_version >= "3.8.2" and extra == "docs-build"
 Requires-Dist: ruff~=0.12.10; extra == "docs-build"
-Requires-Dist: sift-stream-bindings==0.3.0; extra == "docs-build"
+Requires-Dist: sift-stream-bindings==0.4.1; extra == "docs-build"
 Requires-Dist: tomlkit~=0.13.3; extra == "docs-build"
 Requires-Dist: types-pyOpenSSL<24.0.0; extra == "docs-build"
 Provides-Extra: file-imports
@@ -159,9 +164,9 @@ Requires-Dist: types-pyOpenSSL<24.0.0; extra == "openssl"
 Provides-Extra: rosbags
 Requires-Dist: rosbags~=0.0; python_full_version >= "3.8.2" and extra == "rosbags"
 Provides-Extra: sift-stream
-Requires-Dist: sift-stream-bindings==0.3.0; extra == "sift-stream"
+Requires-Dist: sift-stream-bindings==0.4.1; extra == "sift-stream"
 Provides-Extra: sift-stream-bindings
-Requires-Dist: sift-stream-bindings==0.3.0; extra == "sift-stream-bindings"
+Requires-Dist: sift-stream-bindings==0.4.1; extra == "sift-stream-bindings"
 Provides-Extra: tdms
 Requires-Dist: npTDMS~=1.9; extra == "tdms"
 

{sift_stack_py-0.17.1 → sift_stack_py-0.18.0}/lib/sift_client/_internal/grpc_transport/transport.py

@@ -8,7 +8,6 @@ from __future__ import annotations
 
 from importlib.metadata import PackageNotFoundError, version
 from typing import TYPE_CHECKING, Any, TypedDict, cast
-from urllib.parse import ParseResult, urlparse
 
 import grpc
 import grpc.aio as grpc_aio
@@ -21,6 +20,7 @@ from sift_client._internal.grpc_transport._interceptors.metadata import (
     Metadata,
     MetadataInterceptor,
 )
+from sift_client._internal.urls import parse_host
 
 if TYPE_CHECKING:
     from sift_client._internal.grpc_transport._async_interceptors.base import ClientAsyncInterceptor
@@ -81,7 +81,7 @@ def use_sift_channel(
 
     credentials = get_ssl_credentials(cert_via_openssl)
     options = _compute_channel_options(config)
-    api_uri = _clean_uri(config["uri"], use_ssl)
+    api_uri = parse_host(config["uri"])
     channel = grpc.secure_channel(api_uri, credentials, options)
     interceptors = _compute_sift_interceptors(config, metadata)
     return grpc.intercept_channel(channel, *interceptors)
@@ -101,7 +101,7 @@ def use_sift_async_channel(
         return _use_insecure_sift_async_channel(config, metadata)
 
     return grpc_aio.secure_channel(
-        target=_clean_uri(config["uri"], use_ssl),
+        target=parse_host(config["uri"]),
         credentials=get_ssl_credentials(cert_via_openssl),
         options=_compute_channel_options(config),
         interceptors=_compute_sift_async_interceptors(config, metadata),
@@ -115,7 +115,7 @@ def _use_insecure_sift_channel(
     FOR DEVELOPMENT PURPOSES ONLY
     """
     options = _compute_channel_options(config)
-    api_uri = _clean_uri(config["uri"], False)
+    api_uri = parse_host(config["uri"])
     channel = grpc.insecure_channel(api_uri, options)
     interceptors = _compute_sift_interceptors(config, metadata)
     return grpc.intercept_channel(channel, *interceptors)
@@ -128,7 +128,7 @@ def _use_insecure_sift_async_channel(
     FOR DEVELOPMENT PURPOSES ONLY
     """
     return grpc_aio.insecure_channel(
-        target=_clean_uri(config["uri"], False),
+        target=parse_host(config["uri"]),
         options=_compute_channel_options(config),
         interceptors=_compute_sift_async_interceptors(config, metadata),
     )
@@ -209,21 +209,6 @@ def _metadata_async_interceptor(
     return MetadataAsyncInterceptor(md)
 
 
-def _clean_uri(uri: str, use_ssl: bool) -> str:
-    """
-    This will automatically transform the URI to an acceptable form regardless of whether or not
-    users included the scheme in the URL or included trailing slashes.
-    """
-
-    if "http://" in uri or "https://" in uri:
-        parsed: ParseResult = urlparse(uri)
-        return parsed.netloc
-
-    full_uri = f"https://{uri}" if use_ssl else f"http://{uri}"
-    parsed_res: ParseResult = urlparse(full_uri)
-    return parsed_res.netloc
-
-
 def _compute_user_agent() -> str:
     try:
         return f"sift_stack_py/{version('sift_stack_py')}"

{sift_stack_py-0.17.1 → sift_stack_py-0.18.0}/lib/sift_client/_internal/low_level_wrappers/_test_results_log.py

@@ -32,8 +32,8 @@ versa), which is acceptable because writes are tiny and we only have one reader.
 
 Waiting for the lock is cooperative: ``AsyncFileLock`` retries a non-blocking
 acquire and sleeps on the event loop between attempts, so a contended or stale
-lock never blocks the loop thread (the hang in ENG-12003). The acquire is also
-bounded by ``LOG_LOCK_TIMEOUT_SECONDS``, surfacing a stuck lock as
+lock never blocks the loop thread. The acquire is also
+bounded by ``LOG_LOCK_TIMEOUT_SECONDS``, so a stuck lock surfaces as
 ``TimeoutError`` instead of waiting forever. The file read/write under the lock
 runs inline on the loop; it is a tiny local-file operation, the same class of
 brief synchronous work async methods do throughout this client.
@@ -49,6 +49,7 @@ Ad-hoc writers to the same path are not protected.
 from __future__ import annotations
 
 import json
+import logging
 import os
 import re
 from dataclasses import dataclass, field
@@ -58,9 +59,13 @@ from typing import TYPE_CHECKING, Any, Generator
 from filelock import AsyncFileLock, Timeout
 from google.protobuf import json_format
 
+from sift_client._internal.pytest_plugin.audit_log import log_event
+
 if TYPE_CHECKING:
     from sift_client.sift_types.test_report import TestMeasurement, TestReport, TestStep
 
+logger = logging.getLogger(__name__)
+
 
 # Seconds to wait for the sidecar lock before raising TimeoutError. Long enough
 # to absorb brief contention, short enough that a stale holder can't block forever.
@@ -158,9 +163,13 @@ class _ReplayState:
 
 @dataclass
 class ReplayResult:
-    """Result of replaying a log file."""
+    """Result of replaying a log file.
 
-    report: TestReport
+    ``report`` is None on an incremental resume tick that uploaded only steps or
+    measurements; the report itself was created on an earlier tick.
+    """
+
+    report: TestReport | None = None
     steps: list[TestStep] = field(default_factory=list)
     measurements: list[TestMeasurement] = field(default_factory=list)
 
@@ -270,6 +279,9 @@ def parse_log_data_lines(
             continue
         match = line_pattern.match(line)
         if not match:
+            log_event(
+                logger, logging.WARNING, "log.parse_error", line=data_line_count + 1, text=line
+            )
             raise ValueError(f"Invalid log line: {line}")
         data_line_count += 1
         if data_line_count <= start_line:

{sift_stack_py-0.17.1 → sift_stack_py-0.18.0}/lib/sift_client/_internal/low_level_wrappers/ingestion.py

@@ -236,6 +236,86 @@ class IngestionLowLevelClient(LowLevelClientBase, WithGrpcClient):
         return _hash_flows(asset_name=asset_name, flows=flows)
 
 
+async def _build_sift_stream_instance(
+    api_key: str,
+    grpc_uri: str,
+    ingestion_config_form: IngestionConfigFormPy,
+    run_form: RunFormPy | None = None,
+    run_id: str | None = None,
+    asset_tags: list[str] | None = None,
+    asset_metadata: list[MetadataPy] | None = None,
+    streaming_mode: StreamingMode = ...,  # type: ignore[assignment]
+    retry_policy: RetryPolicyPy | None = None,
+    disk_backup_policy: DiskBackupPolicyPy | None = None,
+    checkpoint_interval_seconds: int | None = None,
+    enable_tls: bool = True,
+    tracing_config: TracingConfig | None = None,
+) -> SiftStreamPy:
+    """Build a raw `SiftStreamPy` without wrapping it in a client.
+
+    Shared by both `IngestionConfigStreamingLowLevelClient` and the auto-register path.
+    """
+    # Importing here to allow sift_stream_bindings to be an optional dependency for non-ingestion users
+    # TODO(nathan): Fix bindings to fix mypy issues with tracing functions
+    from sift_stream_bindings import (  # type: ignore[attr-defined]
+        DurationPy,
+        SiftStreamBuilderPy,
+        init_tracing,  # type: ignore[attr-defined]
+        init_tracing_with_file,  # type: ignore[attr-defined]
+        is_tracing_initialized,  # type: ignore[attr-defined]
+    )
+
+    from sift_client.resources.ingestion import StreamingMode, TracingConfig
+
+    _default_max_log_files = 7
+    _default_logfile_prefix = "sift_stream_bindings.log"
+
+    if streaming_mode is ...:  # type: ignore[comparison-overlap]
+        streaming_mode = StreamingMode.LIVE_WITH_BACKUPS
+
+    if not is_tracing_initialized():
+        if tracing_config is None:
+            tracing_config = TracingConfig.with_file()
+
+        if tracing_config.log_dir is not None:
+            init_tracing_with_file(
+                tracing_config.level,
+                tracing_config.log_dir,
+                tracing_config.filename_prefix or _default_logfile_prefix,
+                tracing_config.max_log_files or _default_max_log_files,
+            )
+        else:
+            init_tracing(tracing_config.level)
+
+    sift_builder = SiftStreamBuilderPy(uri=grpc_uri, apikey=api_key)
+    sift_builder.enable_tls = enable_tls
+
+    config_builder = sift_builder.ingestion_config(ingestion_config_form)
+    config_builder.run = run_form
+    config_builder.run_id = run_id
+    config_builder.asset_tags = asset_tags
+    config_builder.metadata = asset_metadata
+
+    if streaming_mode == StreamingMode.LIVE_ONLY:
+        return await config_builder.live_only().build()
+
+    elif streaming_mode == StreamingMode.FILE_BACKUP:
+        fb_builder = config_builder.file_backup()
+        if disk_backup_policy is not None:
+            fb_builder.disk_backup_policy = disk_backup_policy
+        return await fb_builder.build()
+
+    else:  # LIVE_WITH_BACKUPS (default)
+        lwb_builder = config_builder.live_with_backups()
+        if retry_policy is not None:
+            lwb_builder.retry_policy = retry_policy
+        if disk_backup_policy is not None:
+            lwb_builder.disk_backup_policy = disk_backup_policy
+        if checkpoint_interval_seconds is not None:
+            lwb_builder.checkpoint_interval = DurationPy(secs=checkpoint_interval_seconds, nanos=0)
+        return await lwb_builder.build()
+
+
 class IngestionConfigStreamingLowLevelClient(LowLevelClientBase):
     DEFAULT_MAX_LOG_FILES = 7  # Equal to 1 week of logs
     DEFAULT_LOGFILE_PREFIX = "sift_stream_bindings.log"
@@ -262,67 +342,21 @@ class IngestionConfigStreamingLowLevelClient(LowLevelClientBase):
         enable_tls: bool = True,
         tracing_config: TracingConfig | None = None,
     ) -> IngestionConfigStreamingLowLevelClient:
-        # Importing here to allow sift_stream_bindings to be an optional dependancy for non-ingestion users
-        # TODO(nathan): Fix bindings to fix mypy issues with tracing functions
-        from sift_stream_bindings import (  # type: ignore[attr-defined]
-            DurationPy,
-            SiftStreamBuilderPy,
-            init_tracing,  # type: ignore[attr-defined]
-            init_tracing_with_file,  # type: ignore[attr-defined]
-            is_tracing_initialized,  # type: ignore[attr-defined]
+        sift_stream_instance = await _build_sift_stream_instance(
+            api_key=api_key,
+            grpc_uri=grpc_uri,
+            ingestion_config_form=ingestion_config_form,
+            run_form=run_form,
+            run_id=run_id,
+            asset_tags=asset_tags,
+            asset_metadata=asset_metadata,
+            streaming_mode=streaming_mode,
+            retry_policy=retry_policy,
+            disk_backup_policy=disk_backup_policy,
+            checkpoint_interval_seconds=checkpoint_interval_seconds,
+            enable_tls=enable_tls,
+            tracing_config=tracing_config,
         )
-
-        from sift_client.resources.ingestion import StreamingMode, TracingConfig
-
-        if streaming_mode is ...:  # type: ignore[comparison-overlap]
-            streaming_mode = StreamingMode.LIVE_WITH_BACKUPS
-
-        if not is_tracing_initialized():
-            if tracing_config is None:
-                tracing_config = TracingConfig.with_file()
-
-            if tracing_config.log_dir is not None:
-                # Use file logging
-                init_tracing_with_file(
-                    tracing_config.level,
-                    tracing_config.log_dir,
-                    tracing_config.filename_prefix or cls.DEFAULT_LOGFILE_PREFIX,
-                    tracing_config.max_log_files or cls.DEFAULT_MAX_LOG_FILES,
-                )
-            else:
-                # Use stdout/stderr only
-                init_tracing(tracing_config.level)
-
-        sift_builder = SiftStreamBuilderPy(uri=grpc_uri, apikey=api_key)
-        sift_builder.enable_tls = enable_tls
-
-        config_builder = sift_builder.ingestion_config(ingestion_config_form)
-        config_builder.run = run_form
-        config_builder.run_id = run_id
-        config_builder.asset_tags = asset_tags
-        config_builder.metadata = asset_metadata
-
-        if streaming_mode == StreamingMode.LIVE_ONLY:
-            sift_stream_instance = await config_builder.live_only().build()
-
-        elif streaming_mode == StreamingMode.FILE_BACKUP:
-            fb_builder = config_builder.file_backup()
-            if disk_backup_policy is not None:
-                fb_builder.disk_backup_policy = disk_backup_policy
-            sift_stream_instance = await fb_builder.build()
-
-        else:  # LIVE_WITH_BACKUPS (default)
-            lwb_builder = config_builder.live_with_backups()
-            if retry_policy is not None:
-                lwb_builder.retry_policy = retry_policy
-            if disk_backup_policy is not None:
-                lwb_builder.disk_backup_policy = disk_backup_policy
-            if checkpoint_interval_seconds is not None:
-                lwb_builder.checkpoint_interval = DurationPy(
-                    secs=checkpoint_interval_seconds, nanos=0
-                )
-            sift_stream_instance = await lwb_builder.build()
-
         return cls(sift_stream_instance)
 
     async def send(self, flow: FlowPy):