remove relative imports

sift-stack · Jun 18, 2024 · 9565d75 · 9565d75
1 parent b294c04
commit 9565d75
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 38 deletions.
diff --git a/python/lib/sift_py/ingestion/config/telemetry.py b/python/lib/sift_py/ingestion/config/telemetry.py
@@ -2,8 +2,8 @@
 
 from typing import List, Optional
 
-from ..flow import FlowConfig
-from ..rule.config import RuleConfig
+from sift_py.ingestion.flow import FlowConfig
+from sift_py.ingestion.rule.config import RuleConfig
 
 
 class TelemetryConfig:

diff --git a/python/lib/sift_py/ingestion/config/yaml.py b/python/lib/sift_py/ingestion/config/yaml.py
@@ -5,16 +5,21 @@
 from typing import Dict, List, Literal, Optional, TypedDict, cast
 
 import yaml
-from typing_extensions import NotRequired
-
-from ..channel import ChannelBitFieldElement, ChannelDataType, ChannelEnumType, channel_fqn
-from ..flow import ChannelConfig, FlowConfig
-from ..rule.config import (
+from sift_py.ingestion.channel import (
+    ChannelBitFieldElement,
+    ChannelDataType,
+    ChannelEnumType,
+    channel_fqn,
+)
+from sift_py.ingestion.flow import ChannelConfig, FlowConfig
+from sift_py.ingestion.rule.config import (
     RuleActionAnnotationKind,
     RuleActionCreateDataReviewAnnotation,
     RuleActionCreatePhaseAnnotation,
     RuleConfig,
 )
+from typing_extensions import NotRequired
+
 from .telemetry import TelemetryConfig
 
 

diff --git a/python/lib/sift_py/ingestion/config/yaml_test.py b/python/lib/sift_py/ingestion/config/yaml_test.py
@@ -4,18 +4,17 @@
 
 import pytest
 import yaml
-
-from ..channel import ChannelDataType
-from ..rule.config import (
-    RuleActionCreateDataReviewAnnotation,
-    RuleActionCreatePhaseAnnotation,
-    RuleActionKind,
-)
-from .yaml import (
+from sift_py.ingestion.channel import ChannelDataType
+from sift_py.ingestion.config.yaml import (
     NamedExpressionsYamlSpec,
     YamlConfigError,
     _try_from_yaml_str,
 )
+from sift_py.ingestion.rule.config import (
+    RuleActionCreateDataReviewAnnotation,
+    RuleActionCreatePhaseAnnotation,
+    RuleActionKind,
+)
 
 
 def test_telemetry_config():

diff --git a/python/lib/sift_py/ingestion/impl/ingest.py b/python/lib/sift_py/ingestion/impl/ingest.py
@@ -19,16 +19,15 @@
 from sift.runs.v2.runs_pb2 import CreateRunRequest, CreateRunResponse
 from sift.runs.v2.runs_pb2_grpc import RunServiceStub
 from sift_internal.convert.json import to_json
-
-from ...grpc.transport import SiftChannel
-from ..channel import ChannelValue, channel_fqn, empty_value, is_data_type
-from ..config.telemetry import TelemetryConfig
-from ..flow import FlowConfig
-from ..rule.config import RuleConfig
-from .ingestion_config import (
+from sift_py.grpc.transport import SiftChannel
+from sift_py.ingestion.channel import ChannelValue, channel_fqn, empty_value, is_data_type
+from sift_py.ingestion.config.telemetry import TelemetryConfig
+from sift_py.ingestion.flow import FlowConfig
+from sift_py.ingestion.impl.ingestion_config import (
     create_ingestion_config,
     get_ingestion_config_by_client_key,
 )
+from sift_py.ingestion.rule.config import RuleConfig
 
 
 class IngestionServiceImpl:

diff --git a/python/lib/sift_py/ingestion/impl/ingestion_config.py b/python/lib/sift_py/ingestion/impl/ingestion_config.py
@@ -14,9 +14,8 @@
     IngestionConfigServiceStub,
 )
 from sift_internal.convert.protobuf import try_cast_pb
-
-from ...grpc.transport import SiftChannel
-from ..flow import FlowConfig
+from sift_py.grpc.transport import SiftChannel
+from sift_py.ingestion.flow import FlowConfig
 
 
 def get_ingestion_config_by_client_key(

diff --git a/python/lib/sift_py/ingestion/impl/rule.py b/python/lib/sift_py/ingestion/impl/rule.py
@@ -1,9 +1,15 @@
-from ...grpc.transport import SiftChannel
-from ..rule.config import RuleConfig
-from sift.rules.v1.rules_pb2 import UpdateJsonRulesRequest, UpdateJsonRulesResponse, JsonRulesRequest
+from typing import List, Optional, cast
+
+from sift.rules.v1.rules_pb2 import (
+    JsonRulesRequest,
+    UpdateJsonRulesRequest,
+    UpdateJsonRulesResponse,
+)
 from sift.rules.v1.rules_pb2_grpc import RuleServiceStub
 from sift_internal.convert.json import to_json
-from typing import cast, List, Optional
+from sift_py.grpc.transport import SiftChannel
+from sift_py.ingestion.rule.config import RuleConfig
+
 
 def update_rules(
     transport_channel: SiftChannel,

diff --git a/python/lib/sift_py/ingestion/rule/config.py b/python/lib/sift_py/ingestion/rule/config.py
@@ -7,8 +7,7 @@
 from sift.annotations.v1.annotations_pb2 import AnnotationType
 from sift.rules.v1.rules_pb2 import ActionKind
 from sift_internal.convert.json import AsJson
-
-from ..channel import ChannelConfig, channel_fqn
+from sift_py.ingestion.channel import ChannelConfig, channel_fqn
 
 
 class RuleConfig(AsJson):

diff --git a/python/lib/sift_py/ingestion/rule/config_test.py b/python/lib/sift_py/ingestion/rule/config_test.py
@@ -1,4 +1,5 @@
-from ..channel import ChannelConfig, ChannelDataType
+from sift_py.ingestion.channel import ChannelConfig, ChannelDataType
+
 from .config import (
     RuleActionCreateDataReviewAnnotation,
     RuleActionCreatePhaseAnnotation,

diff --git a/python/lib/sift_py/ingestion/service.py b/python/lib/sift_py/ingestion/service.py
@@ -8,12 +8,11 @@
     IngestWithConfigDataStreamRequest,
 )
 from sift.ingestion_configs.v1.ingestion_configs_pb2 import IngestionConfig
-
-from ..grpc.transport import SiftChannel
-from ..ingestion.flow import FlowConfig
-from .channel import ChannelValue
-from .config.telemetry import TelemetryConfig
-from .impl.ingest import IngestionServiceImpl
+from sift_py.grpc.transport import SiftChannel
+from sift_py.ingestion.channel import ChannelValue
+from sift_py.ingestion.config.telemetry import TelemetryConfig
+from sift_py.ingestion.flow import FlowConfig
+from sift_py.ingestion.impl.ingest import IngestionServiceImpl
 
 
 class IngestionService(IngestionServiceImpl):