chore: move forward_client and content_type tp api

src/karapace/api/controller.py

@@ -30,7 +30,7 @@
     SubjectSoftDeletedException,
     VersionNotFoundException,
 )
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from karapace.core.protobuf.exception import ProtobufUnresolvedDependencyException
 from karapace.core.schema_models import (
     ParsedTypedSchema,

src/karapace/api/factory.py

@@ -10,7 +10,7 @@
 from karapace import version as karapace_version
 from karapace.core.auth import AuthenticatorAndAuthorizer
 from karapace.core.config import Config
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from karapace.core.logging_setup import configure_logging, log_config_without_secrets
 from karapace.core.statsd import StatsClient
 from karapace.api.container import SchemaRegistryContainer

src/karapace/api/middlewares/__init__.py

@@ -6,7 +6,7 @@
 from collections.abc import Awaitable, Callable
 from fastapi import FastAPI, HTTPException, Request, Response
 from fastapi.responses import JSONResponse
-from karapace.core.content_type import check_schema_headers
+from karapace.api.content_type import check_schema_headers
 from karapace.api.telemetry.middleware import setup_telemetry_middleware
 
 

src/karapace/api/routers/config.py

@@ -6,7 +6,7 @@
 from dependency_injector.wiring import inject, Provide
 from fastapi import APIRouter, Depends, Request
 from karapace.core.auth import AuthenticatorAndAuthorizer, Operation, User
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from karapace.core.typing import Subject
 from karapace.api.container import SchemaRegistryContainer
 from karapace.api.controller import KarapaceSchemaRegistryController

src/karapace/api/routers/master_availability.py

@@ -6,7 +6,7 @@
 from dependency_injector.wiring import inject, Provide
 from fastapi import APIRouter, Depends, Request, Response
 from karapace.core.config import Config
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from pydantic import BaseModel
 from karapace.api.container import SchemaRegistryContainer
 from karapace.core.schema_registry import KarapaceSchemaRegistry

src/karapace/api/routers/subjects.py

@@ -6,7 +6,7 @@
 from dependency_injector.wiring import inject, Provide
 from fastapi import APIRouter, Depends, Request
 from karapace.core.auth import AuthenticatorAndAuthorizer, Operation, User
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from karapace.core.typing import Subject
 from karapace.api.container import SchemaRegistryContainer
 from karapace.api.controller import KarapaceSchemaRegistryController

src/karapace/core/container.py

@@ -6,7 +6,7 @@
 from dependency_injector import containers, providers
 from karapace.core.auth import get_authorizer, HTTPAuthorizer, NoAuthAndAuthz
 from karapace.core.config import Config
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from karapace.core.instrumentation.prometheus import PrometheusInstrumentation
 from karapace.core.statsd import StatsClient
 

tests/unit/api/test_forwarding.py

@@ -7,7 +7,7 @@
 
 from fastapi import Request
 from fastapi.exceptions import HTTPException
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from karapace.core.typing import PrimaryInfo
 from karapace.api.controller import KarapaceSchemaRegistryController
 from karapace.core.schema_registry import KarapaceSchemaRegistry

tests/unit/test_forwarding_client.py

@@ -10,7 +10,7 @@
 from dataclasses import dataclass
 from fastapi import Request
 from fastapi.datastructures import Headers
-from karapace.core.forward_client import ForwardClient
+from karapace.api.forward_client import ForwardClient
 from pydantic import BaseModel
 from starlette.datastructures import MutableHeaders
 from tests.base_testcase import BaseTestCase
@@ -32,7 +32,7 @@ class ContentTypeTestCase(BaseTestCase):
 
 @pytest.fixture(name="forward_client")
 def fixture_forward_client() -> ForwardClient:
-    with patch("karapace.core.forward_client.aiohttp") as mocked_aiohttp:
+    with patch("karapace.api.forward_client.aiohttp") as mocked_aiohttp:
         mocked_aiohttp.ClientSession.return_value = Mock(
             spec=aiohttp.ClientSession, headers={"User-Agent": ForwardClient.USER_AGENT}
         )