UncountablePythonSDK 0.0.57__py3-none-any.whl → 0.0.58__py3-none-any.whl

{UncountablePythonSDK-0.0.57.dist-info → UncountablePythonSDK-0.0.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: UncountablePythonSDK
-Version: 0.0.57
+Version: 0.0.58
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{UncountablePythonSDK-0.0.57.dist-info → UncountablePythonSDK-0.0.58.dist-info}/RECORD

@@ -81,10 +81,11 @@ uncountable/core/version.py,sha256=SqQIHLhiVZXQBeOwygS2FRZ4WEO27JmWhse0lKm7fgU,2
 uncountable/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/construct_client.py,sha256=I2XTamht13vs-JYkV4PpNS_Pc4FJm-KVYqNNvxI4qNk,1916
 uncountable/integration/cron.py,sha256=e5456IYJF2ipiSsd1R2T334lfe7mtp-gwP7JpS645L0,1858
-uncountable/integration/entrypoint.py,sha256=9rk06gBTsCqytIs8Shsnlf6ir_4Uq5d5rfP1veiSLzc,1437
+uncountable/integration/entrypoint.py,sha256=wgOXhTzErttRjOzV4rS4psZW5qUKIa5ez89QndQl61k,785
 uncountable/integration/job.py,sha256=UTzcMes2KrBBRLOM3u94imMKLLnv50glqOkNf8-JOZw,1022
+uncountable/integration/scan_profiles.py,sha256=3o_h5Ta8ZQEX1epWyXhtyEof0M1b7MobVG7bRKcsFuM,1166
 uncountable/integration/server.py,sha256=bmX-ukLiNDq0ThVB2lUyXl-vtID5HI4gqJHxhsVNG3w,4440
-uncountable/integration/telemetry.py,sha256=LAXKVqq96h2pbEwUODIXKhfSt8GVqTDpDiGvAiBQhMk,5341
+uncountable/integration/telemetry.py,sha256=wJMMlGWJTCXB1WxfpSI56x_qLmH9TgIAm9lx137gDH4,5966
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=YtQHJ1DBGPhxKFRCfiXqohOYUceKSxMVOJ88aPI48Ug,181
 uncountable/integration/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -126,8 +127,8 @@ uncountable/types/input_attributes.py,sha256=IrIKQnHqHdS1Utdfzr9GnOe17a8riaqYcO1
 uncountable/types/input_attributes_t.py,sha256=wE1ekiQfb72Z9VpF5SHipKJkgaJFUHJrNkkJdmuhF9w,820
 uncountable/types/inputs.py,sha256=6RIEFfCxLqpeHEGOpu63O4i8zPogjGeB7wiV_rPBw_g,404
 uncountable/types/inputs_t.py,sha256=RW7gF9zTOwByu-nMTMVuBabLOuWKx4O1nvfgvx_R55o,1611
-uncountable/types/job_definition.py,sha256=Cgwop6iNcWEsEpfjMl1EtkRES_3-SVzpMe-w73V4G_U,1862
-uncountable/types/job_definition_t.py,sha256=pL-0YVyR0oz6-5wWXJsX1UyYo4R_FPwhOYFj9iMKgvo,7170
+uncountable/types/job_definition.py,sha256=HXfaYl5Nafm9C0teQLBtqzroe1HlfKJtfGVm2-40hvg,1937
+uncountable/types/job_definition_t.py,sha256=0BKIqg1fSJKXHxLAWm11bgz7OC4ye1k4EPaY439_Mns,7549
 uncountable/types/outputs.py,sha256=sUZx_X-TKCZtLm1YCEH8OISX9DdPlv9ZuUfM3-askCc,281
 uncountable/types/outputs_t.py,sha256=2aORUOr0ls1ZYo-ddkWax3D1ZndmQsWtHfJxpYozlhg,656
 uncountable/types/overrides.py,sha256=Mv-smwK1B3pvbt48fNOiqkeQn9wMgYlBFJKUBOJqceE,431
@@ -243,7 +244,7 @@ uncountable/types/api/triggers/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr
 uncountable/types/api/triggers/run_trigger.py,sha256=_Rpha9nxXI3Xr17CrGDtofg4HZ81x2lt0rMZ6As0qfE,893
 uncountable/types/api/uploader/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/uploader/invoke_uploader.py,sha256=Rc77y5q-3R9-SNQgm8P35zKaW2D1Hbtm7PDixnOn1G0,1025
-UncountablePythonSDK-0.0.57.dist-info/METADATA,sha256=Ay-ZqQ6b7KqlG96Kv9ZJjBheNvYMCQBgfhkbaRCQLas,1934
-UncountablePythonSDK-0.0.57.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-UncountablePythonSDK-0.0.57.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-UncountablePythonSDK-0.0.57.dist-info/RECORD,,
+UncountablePythonSDK-0.0.58.dist-info/METADATA,sha256=IPsP_FApLq2unwFPEHKdIBZ9yaQr8EGgdcr4YojkYAA,1934
+UncountablePythonSDK-0.0.58.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+UncountablePythonSDK-0.0.58.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+UncountablePythonSDK-0.0.58.dist-info/RECORD,,

{UncountablePythonSDK-0.0.57.dist-info → UncountablePythonSDK-0.0.58.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

uncountable/integration/entrypoint.py

@@ -1,38 +1,17 @@
-import os
-from importlib import resources
-
-from pkgs.argument_parser import CachedParser
 from uncountable.integration.db.connect import create_db_engine
+from uncountable.integration.scan_profiles import load_profiles
 from uncountable.integration.server import IntegrationServer
-from uncountable.types.job_definition_t import ProfileDefinition
-
-profile_parser = CachedParser(ProfileDefinition)
 
 
 def main(blocking: bool) -> None:
-    profiles_module = os.environ["UNC_PROFILES_MODULE"]
     with IntegrationServer(create_db_engine()) as server:
-        profiles = [
-            entry
-            for entry in resources.files(profiles_module).iterdir()
-            if entry.is_dir()
-        ]
-        for profile_file in profiles:
-            profile_name = profile_file.name
-            try:
-                profile = profile_parser.parse_yaml_resource(
-                    package=".".join([profiles_module, profile_name]),
-                    resource="profile.yaml",
-                )
-            except FileNotFoundError as e:
-                print(f"WARN: profile.yaml not found for {profile_name}", e)
-                continue
+        for profile_details in load_profiles():
             server.register_profile(
-                profile_name=profile_name,
-                base_url=profile.base_url,
-                auth_retrieval=profile.auth_retrieval,
-                jobs=profile.jobs,
-                client_options=profile.client_options,
+                profile_name=profile_details.name,
+                base_url=profile_details.definition.base_url,
+                auth_retrieval=profile_details.definition.auth_retrieval,
+                jobs=profile_details.definition.jobs,
+                client_options=profile_details.definition.client_options,
             )
 
         if blocking:

uncountable/integration/scan_profiles.py

@@ -0,0 +1,36 @@
+import os
+from dataclasses import dataclass
+from importlib import resources
+
+from pkgs.argument_parser import CachedParser
+from uncountable.types import job_definition_t
+
+profile_parser = CachedParser(job_definition_t.ProfileDefinition)
+
+
+@dataclass(kw_only=True)
+class ProfileDetails:
+    name: str
+    definition: job_definition_t.ProfileDefinition
+
+
+def load_profiles() -> list[ProfileDetails]:
+    profiles_module = os.environ["UNC_PROFILES_MODULE"]
+    profiles = [
+        entry for entry in resources.files(profiles_module).iterdir() if entry.is_dir()
+    ]
+    profile_details: list[ProfileDetails] = []
+    for profile_file in profiles:
+        profile_name = profile_file.name
+        try:
+            definition = profile_parser.parse_yaml_resource(
+                package=".".join([profiles_module, profile_name]),
+                resource="profile.yaml",
+            )
+            profile_details.append(
+                ProfileDetails(name=profile_name, definition=definition)
+            )
+        except FileNotFoundError as e:
+            print(f"WARN: profile.yaml not found for {profile_name}", e)
+            continue
+    return profile_details

uncountable/integration/telemetry.py

@@ -1,14 +1,16 @@
 import functools
 import os
-import sys
 import time
 from contextlib import contextmanager
 from enum import StrEnum
-from typing import Generator, TextIO, assert_never, cast
+from typing import Generator, assert_never, cast
 
-from opentelemetry import trace
+from opentelemetry import _logs, trace
+from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
-from opentelemetry.sdk._logs import LogRecord
+from opentelemetry.sdk._logs import Logger as OTELLogger
+from opentelemetry.sdk._logs import LoggerProvider, LogRecord
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor, ConsoleLogExporter
 from opentelemetry.sdk.resources import Attributes, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
@@ -25,7 +27,7 @@ def _cast_attributes(attributes: dict[str, base_t.JsonValue]) -> Attributes:
 
 
 @functools.cache
-def get_tracer() -> Tracer:
+def get_otel_resource() -> Resource:
     attributes: dict[str, base_t.JsonValue] = {
         "service.name": "integration-server",
         "sdk.version": get_version(),
@@ -37,12 +39,26 @@ def get_tracer() -> Tracer:
     if unc_env is not None:
         attributes["deployment.environment"] = unc_env
     resource = Resource.create(attributes=_cast_attributes(attributes))
-    provider = TracerProvider(resource=resource)
+    return resource
+
+
+@functools.cache
+def get_otel_tracer() -> Tracer:
+    provider = TracerProvider(resource=get_otel_resource())
     provider.add_span_processor(SimpleSpanProcessor(OTLPSpanExporter()))
     trace.set_tracer_provider(provider)
     return provider.get_tracer("integration.telemetry")
 
 
+@functools.cache
+def get_otel_logger() -> OTELLogger:
+    provider = LoggerProvider(resource=get_otel_resource())
+    provider.add_log_record_processor(BatchLogRecordProcessor(ConsoleLogExporter()))
+    provider.add_log_record_processor(BatchLogRecordProcessor(OTLPLogExporter()))
+    _logs.set_logger_provider(provider)
+    return provider.get_logger("integration.telemetry")
+
+
 class LogSeverity(StrEnum):
     INFO = "Info"
     WARN = "Warn"
@@ -59,6 +75,7 @@ class Logger:
     def _emit_log(
         self, message: str, *, severity: LogSeverity, attributes: Attributes | None
     ) -> None:
+        otel_logger = get_otel_logger()
         log_record = LogRecord(
             body=message,
             severity_text=severity,
@@ -67,9 +84,7 @@ class Logger:
             span_id=self.current_span_id,
             trace_id=self.current_trace_id,
         )
-        log_file: TextIO = sys.stderr if severity == LogSeverity.ERROR else sys.stdout
-        log_file.write(log_record.to_json())
-        log_file.flush()
+        otel_logger.emit(log_record)
 
     def log_info(self, message: str, *, attributes: Attributes | None = None) -> None:
         self._emit_log(
@@ -135,7 +150,7 @@ class JobLogger(Logger):
     def push_scope(
         self, scope_name: str, *, attributes: Attributes | None = None
     ) -> Generator["JobLogger", None, None]:
-        with get_tracer().start_as_current_span(
+        with get_otel_tracer().start_as_current_span(
             scope_name, attributes=self._patch_attributes(attributes)
         ) as span:
             self.current_span_id = span.get_span_context().span_id

uncountable/types/job_definition.py

@@ -19,6 +19,7 @@ from .job_definition_t import JobExecutorGenericUpload as JobExecutorGenericUplo
 from .job_definition_t import JobExecutor as JobExecutor
 from .job_definition_t import JobDefinitionBase as JobDefinitionBase
 from .job_definition_t import CronJobDefinition as CronJobDefinition
+from .job_definition_t import WebhookJobDefinition as WebhookJobDefinition
 from .job_definition_t import JobDefinition as JobDefinition
 from .job_definition_t import AuthRetrievalBase as AuthRetrievalBase
 from .job_definition_t import AuthRetrievalOAuth as AuthRetrievalOAuth

uncountable/types/job_definition_t.py

@@ -39,12 +39,14 @@ __all__: list[str] = [
     "ProfileDefinition",
     "ProfileMetadata",
     "S3CloudProvider",
+    "WebhookJobDefinition",
 ]
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
 class JobDefinitionType(StrEnum):
     CRON = "cron"
+    WEBHOOK = "webhook"
 
 
 # DO NOT MODIFY -- This file is generated by type_spec
@@ -177,6 +179,16 @@ class CronJobDefinition(JobDefinitionBase):
     cron_spec: str
 
 
+# DO NOT MODIFY -- This file is generated by type_spec
+@serial_class(
+    parse_require={"type"},
+)
+@dataclasses.dataclass(kw_only=True)
+class WebhookJobDefinition(JobDefinitionBase):
+    type: typing.Literal[JobDefinitionType.WEBHOOK] = JobDefinitionType.WEBHOOK
+    signature_key_secret: secret_retrieval_t.SecretRetrieval
+
+
 # DO NOT MODIFY -- This file is generated by type_spec
 JobDefinition = typing.Annotated[
     typing.Union[CronJobDefinition],