Resolve circular import

kpops/component_handlers/kafka_connect/model.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, Literal
+from typing import Any
 
 import pydantic
 from pydantic import (
@@ -12,10 +12,8 @@
 from pydantic.json_schema import SkipJsonSchema
 from typing_extensions import override
 
-from kpops.components.base_components.helm_app import HelmAppValues
-from kpops.components.base_components.models.topic import KafkaTopic, KafkaTopicStr
+from kpops.components.common.topic import KafkaTopic, KafkaTopicStr
 from kpops.utils.pydantic import (
-    CamelCaseConfigModel,
     DescConfigModel,
     by_alias,
     exclude_by_value,
@@ -111,15 +109,3 @@ class KafkaConnectConfigErrorResponse(BaseModel):
     name: str
     error_count: int
     configs: list[KafkaConnectConfigDescription]
-
-
-class KafkaConnectorResetterConfig(CamelCaseConfigModel):
-    brokers: str
-    connector: str
-    delete_consumer_group: bool | None = None
-    offset_topic: str | None = None
-
-
-class KafkaConnectorResetterValues(HelmAppValues):
-    connector_type: Literal["source", "sink"]
-    config: KafkaConnectorResetterConfig

kpops/component_handlers/topic/handler.py

@@ -17,7 +17,7 @@
     parse_and_compare_topic_configs,
     parse_rest_proxy_topic_config,
 )
-from kpops.components.base_components.models.topic import KafkaTopic
+from kpops.components.common.topic import KafkaTopic
 from kpops.utils.colorify import greenify, magentaify
 from kpops.utils.dict_differ import Diff, DiffType, render_diff
 

kpops/components/base_components/__init__.py

@@ -1,12 +1,12 @@
-from kpops.components.base_components.helm_app import HelmApp
-from kpops.components.base_components.kafka_app import KafkaApp
-from kpops.components.base_components.kafka_connector import (
+from .helm_app import HelmApp
+from .kafka_app import KafkaApp
+from .kafka_connector import (
     KafkaConnector,
     KafkaSinkConnector,
     KafkaSourceConnector,
 )
-from kpops.components.base_components.kubernetes_app import KubernetesApp
-from kpops.components.base_components.pipeline_component import PipelineComponent
+from .kubernetes_app import KubernetesApp
+from .pipeline_component import PipelineComponent
 
 __all__ = (
     "HelmApp",

kpops/components/base_components/kafka_app.py

@@ -12,9 +12,9 @@
 from kpops.component_handlers import get_handlers
 from kpops.components.base_components.cleaner import Cleaner
 from kpops.components.base_components.helm_app import HelmAppValues
-from kpops.components.base_components.models.topic import KafkaTopic, KafkaTopicStr
 from kpops.components.base_components.pipeline_component import PipelineComponent
 from kpops.components.common.streams_bootstrap import StreamsBootstrap
+from kpops.components.common.topic import KafkaTopic, KafkaTopicStr
 from kpops.config import get_config
 from kpops.utils.docstring import describe_attr
 from kpops.utils.pydantic import (

kpops/components/base_components/kafka_connector.py

@@ -3,7 +3,7 @@
 import logging
 from abc import ABC
 from functools import cached_property
-from typing import Any, NoReturn
+from typing import Any, Literal, NoReturn
 
 import pydantic
 from pydantic import Field, PrivateAttr, ValidationInfo, computed_field, field_validator
@@ -15,18 +15,17 @@
 )
 from kpops.component_handlers.kafka_connect.model import (
     KafkaConnectorConfig,
-    KafkaConnectorResetterConfig,
-    KafkaConnectorResetterValues,
     KafkaConnectorType,
 )
 from kpops.components.base_components.cleaner import Cleaner
 from kpops.components.base_components.helm_app import HelmAppValues
 from kpops.components.base_components.models.from_section import FromTopic
-from kpops.components.base_components.models.topic import KafkaTopic
 from kpops.components.base_components.pipeline_component import PipelineComponent
+from kpops.components.common.topic import KafkaTopic
 from kpops.config import get_config
 from kpops.utils.colorify import magentaify
 from kpops.utils.docstring import describe_attr
+from kpops.utils.pydantic import CamelCaseConfigModel
 
 try:
     from typing import Self  # pyright: ignore[reportAttributeAccessIssue]
@@ -36,6 +35,18 @@
 log = logging.getLogger("KafkaConnector")
 
 
+class KafkaConnectorResetterConfig(CamelCaseConfigModel):
+    brokers: str
+    connector: str
+    delete_consumer_group: bool | None = None
+    offset_topic: str | None = None
+
+
+class KafkaConnectorResetterValues(HelmAppValues):
+    connector_type: Literal["source", "sink"]
+    config: KafkaConnectorResetterConfig
+
+
 class KafkaConnectorResetter(Cleaner, ABC):
     """Helm app for resetting and cleaning a Kafka Connector.
 

kpops/components/base_components/models/to_section.py

@@ -3,7 +3,7 @@
 from pydantic import ConfigDict, Field
 
 from kpops.components.base_components.models import ModelName, ModelVersion, TopicName
-from kpops.components.base_components.models.topic import KafkaTopic, TopicConfig
+from kpops.components.common.topic import KafkaTopic, TopicConfig
 from kpops.utils.docstring import describe_attr
 from kpops.utils.pydantic import DescConfigModel
 

kpops/components/base_components/pipeline_component.py

@@ -17,7 +17,7 @@
 from kpops.components.base_components.models.to_section import (
     ToSection,
 )
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.topic import (
     KafkaTopic,
     OutputTopicTypes,
     TopicConfig,

kpops/components/streams_bootstrap/__init__.py

@@ -1,6 +1,7 @@
 from kpops.components.common.streams_bootstrap import StreamsBootstrap
-from kpops.components.streams_bootstrap.producer.producer_app import ProducerApp
-from kpops.components.streams_bootstrap.streams.streams_app import StreamsApp
+
+from .producer.producer_app import ProducerApp
+from .streams.streams_app import StreamsApp
 
 __all__ = (
     "StreamsBootstrap",

kpops/components/streams_bootstrap/producer/producer_app.py

@@ -7,12 +7,12 @@
     KafkaApp,
     KafkaAppCleaner,
 )
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.streams_bootstrap import StreamsBootstrap
+from kpops.components.common.topic import (
     KafkaTopic,
     OutputTopicTypes,
     TopicConfig,
 )
-from kpops.components.common.streams_bootstrap import StreamsBootstrap
 from kpops.components.streams_bootstrap.app_type import AppType
 from kpops.components.streams_bootstrap.producer.model import ProducerAppValues
 from kpops.utils.docstring import describe_attr

kpops/components/streams_bootstrap/streams/model.py

@@ -10,8 +10,8 @@
     KafkaAppValues,
     KafkaStreamsConfig,
 )
-from kpops.components.base_components.models.topic import KafkaTopic, KafkaTopicStr
 from kpops.components.common.streams_bootstrap import StreamsBootstrapValues
+from kpops.components.common.topic import KafkaTopic, KafkaTopicStr
 from kpops.utils.docstring import describe_attr
 from kpops.utils.pydantic import (
     CamelCaseConfigModel,

kpops/components/streams_bootstrap/streams/streams_app.py

@@ -7,8 +7,8 @@
 from kpops.component_handlers.kubernetes.pvc_handler import PVCHandler
 from kpops.components.base_components.helm_app import HelmApp
 from kpops.components.base_components.kafka_app import KafkaApp, KafkaAppCleaner
-from kpops.components.base_components.models.topic import KafkaTopic
 from kpops.components.common.streams_bootstrap import StreamsBootstrap
+from kpops.components.common.topic import KafkaTopic
 from kpops.components.streams_bootstrap.app_type import AppType
 from kpops.components.streams_bootstrap.streams.model import (
     StreamsAppValues,

tests/component_handlers/schema_handler/test_schema_handler.py

@@ -15,7 +15,7 @@
 from kpops.components.base_components.models.to_section import (
     ToSection,
 )
-from kpops.components.base_components.models.topic import OutputTopicTypes, TopicConfig
+from kpops.components.common.topic import OutputTopicTypes, TopicConfig
 from kpops.config import KpopsConfig, SchemaRegistryConfig
 from kpops.utils.colorify import greenify, magentaify, yellowify
 from tests.pipeline.test_components import TestSchemaProvider

tests/component_handlers/topic/test_topic_handler.py

@@ -19,7 +19,7 @@
     TopicResponse,
     TopicSpec,
 )
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.topic import (
     KafkaTopic,
     OutputTopicTypes,
     TopicConfig,

tests/components/test_kafka_sink_connector.py

@@ -25,7 +25,7 @@
 from kpops.components.base_components.models.to_section import (
     ToSection,
 )
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.topic import (
     KafkaTopic,
     OutputTopicTypes,
     TopicConfig,

tests/components/test_kafka_source_connector.py

@@ -25,7 +25,7 @@
 from kpops.components.base_components.models.to_section import (
     ToSection,
 )
-from kpops.components.base_components.models.topic import OutputTopicTypes, TopicConfig
+from kpops.components.common.topic import OutputTopicTypes, TopicConfig
 from kpops.utils.environment import ENV
 from tests.components.test_kafka_connector import (
     CONNECTOR_CLEAN_HELM_NAMEOVERRIDE,

tests/components/test_producer_app.py

@@ -7,7 +7,7 @@
 from kpops.component_handlers import ComponentHandlers, get_handlers
 from kpops.component_handlers.helm_wrapper.model import HelmUpgradeInstallFlags
 from kpops.component_handlers.helm_wrapper.utils import create_helm_release_name
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.topic import (
     KafkaTopic,
     OutputTopicTypes,
     TopicConfig,

tests/components/test_streams_app.py

@@ -16,7 +16,7 @@
 from kpops.components.base_components.models.to_section import (
     ToSection,
 )
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.topic import (
     KafkaTopic,
     OutputTopicTypes,
     TopicConfig,

tests/components/test_topic.py

@@ -3,7 +3,7 @@
 import pydantic
 import pytest
 
-from kpops.components.base_components.models.topic import (
+from kpops.components.common.topic import (
     KafkaTopic,
     KafkaTopicStr,
     OutputTopicTypes,

tests/pipeline/test_components/components.py

@@ -10,8 +10,8 @@
 from kpops.components.base_components.models.to_section import (
     ToSection,
 )
-from kpops.components.base_components.models.topic import OutputTopicTypes, TopicConfig
 from kpops.components.base_components.pipeline_component import PipelineComponent
+from kpops.components.common.topic import OutputTopicTypes, TopicConfig
 from kpops.components.streams_bootstrap.producer.producer_app import ProducerApp
 from kpops.components.streams_bootstrap.streams.streams_app import StreamsApp
 

tests/pipeline/test_components_without_schema_handler/components.py

@@ -2,8 +2,8 @@
 
 from kpops.component_handlers.kafka_connect.model import KafkaConnectorConfig
 from kpops.components.base_components.kafka_connector import KafkaSinkConnector
-from kpops.components.base_components.models.topic import OutputTopicTypes
 from kpops.components.base_components.pipeline_component import PipelineComponent
+from kpops.components.common.topic import OutputTopicTypes
 from kpops.components.streams_bootstrap.producer.producer_app import ProducerApp
 from kpops.components.streams_bootstrap.streams.streams_app import StreamsApp