Try solve circular import

bakdata · Jul 8, 2024 · 20368ae · 20368ae
1 parent cbff01c
commit 20368ae
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/hooks/gen_schema.py b/hooks/gen_schema.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 
 from hooks import ROOT
-from kpops.api.file_type import KpopsFileType
+from kpops.const.file_type import KpopsFileType
 from kpops.utils.gen_schema import (
     gen_config_schema,
     gen_defaults_schema,

diff --git a/kpops/cli/main.py b/kpops/cli/main.py
@@ -6,13 +6,18 @@
 import typer
 
 import kpops.api as kpops
-from kpops.api.file_type import CONFIG_YAML, DEFAULTS_YAML, PIPELINE_YAML, KpopsFileType
 from kpops.api.options import FilterType
 from kpops.cli.utils import (
     collect_pipeline_paths,
 )
 from kpops.config import ENV_PREFIX
 from kpops.const import KPOPS, __version__
+from kpops.const.file_type import (
+    CONFIG_YAML,
+    DEFAULTS_YAML,
+    PIPELINE_YAML,
+    KpopsFileType,
+)
 from kpops.utils.gen_schema import (
     gen_config_schema,
     gen_defaults_schema,

diff --git a/kpops/cli/utils.py b/kpops/cli/utils.py
@@ -3,7 +3,7 @@
 from collections.abc import Iterable, Iterator
 from pathlib import Path
 
-from kpops.api.file_type import PIPELINE_YAML
+from kpops.const.file_type import PIPELINE_YAML
 
 
 def collect_pipeline_paths(pipeline_paths: Iterable[Path]) -> Iterator[Path]:

diff --git a/kpops/components/base_components/base_defaults_component.py b/kpops/components/base_components/base_defaults_component.py
@@ -20,9 +20,9 @@
 )
 from pydantic.json_schema import SkipJsonSchema
 
-from kpops.api.file_type import KpopsFileType
 from kpops.component_handlers import ComponentHandlers
 from kpops.config import KpopsConfig
+from kpops.const.file_type import KpopsFileType
 from kpops.utils import cached_classproperty
 from kpops.utils.dict_ops import (
     generate_substitution,

diff --git a/kpops/api/file_type.py → kpops/const/file_type.py b/kpops/api/file_type.py → kpops/const/file_type.py
diff --git a/kpops/utils/cli_commands.py b/kpops/utils/cli_commands.py
@@ -6,8 +6,8 @@
 from pydantic.fields import FieldInfo
 from pydantic_core import PydanticUndefined
 
-from kpops.api.file_type import KpopsFileType
 from kpops.config import KpopsConfig
+from kpops.const.file_type import KpopsFileType
 from kpops.utils.docstring import describe_object
 from kpops.utils.json import is_jsonable
 from kpops.utils.pydantic import collect_fields, issubclass_patched

diff --git a/tests/compiler/test_pipeline_name.py b/tests/compiler/test_pipeline_name.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from kpops.api.file_type import KpopsFileType
+from kpops.const.file_type import KpopsFileType
 from kpops.pipeline import PipelineGenerator
 from kpops.utils.environment import ENV
 

diff --git a/tests/components/test_base_defaults_component.py b/tests/components/test_base_defaults_component.py
@@ -6,13 +6,13 @@
 import pydantic
 import pytest
 
-from kpops.api.file_type import DEFAULTS_YAML, PIPELINE_YAML, KpopsFileType
 from kpops.component_handlers import ComponentHandlers
 from kpops.components.base_components.base_defaults_component import (
     BaseDefaultsComponent,
     get_defaults_file_paths,
 )
 from kpops.config import KpopsConfig
+from kpops.const.file_type import DEFAULTS_YAML, PIPELINE_YAML, KpopsFileType
 from kpops.pipeline import PIPELINE_PATH
 from kpops.utils.environment import ENV
 from tests.components import PIPELINE_BASE_DIR, RESOURCES_PATH

diff --git a/tests/pipeline/test_generate.py b/tests/pipeline/test_generate.py
@@ -11,10 +11,10 @@
 
 import kpops.api as kpops
 from kpops.api.exception import ParsingException, ValidationError
-from kpops.api.file_type import PIPELINE_YAML, KpopsFileType
 from kpops.cli.main import FilterType, app
 from kpops.components.base_components.kafka_connector import KafkaSinkConnector
 from kpops.components.base_components.pipeline_component import PipelineComponent
+from kpops.const.file_type import PIPELINE_YAML, KpopsFileType
 
 runner = CliRunner()