fix project root __init__.py; fix lint, tests

src/dashboard/apigateway/apigateway/apps/access_log/helpers.py

@@ -20,7 +20,7 @@
 import logging
 import urllib
 from abc import ABC, abstractmethod
-from typing import ClassVar
+from typing import ClassVar, Type
 
 from django.conf import settings
 from django.utils.translation import gettext as _
@@ -64,7 +64,7 @@ def get_client_class(self, es_client_type):
 class BaseLogSearch(ABC):
     _es_index: str = settings.ACCESS_LOG_CONFIG["es_index"]
     _es_time_field_name: str = settings.ACCESS_LOG_CONFIG["es_time_field_name"]
-    _es_client_class: ClassVar[BaseESClient]
+    _es_client_class: ClassVar[Type[BaseESClient]]
 
     # FIXME: change api_id to gateway_id
     def __init__(

src/dashboard/apigateway/apigateway/apps/support/resource_doc/import_doc/docs.py

@@ -41,6 +41,7 @@ class BaseDoc:
     resource_id: Optional[int] = None
     resource_doc_id: Optional[int] = None
     resource_doc_swagger_id: Optional[int] = None
+    has_changed: bool = True
 
     @property
     def doc_key(self) -> Optional[str]:

src/dashboard/apigateway/apigateway/controller/crds/v1beta1/convertor.py

@@ -95,9 +95,11 @@ def _iter_convert(self):
 
     def get_kubernetes_resources(self) -> Iterable[KubernetesResource]:
         if self.include_config:
+            assert self._gateway_config
             yield self._gateway_config
 
         if self.include_stage:
+            assert self._stage
             yield self._stage
 
         if self.include_service:

src/dashboard/apigateway/apigateway/controller/registry/dict.py

@@ -38,7 +38,7 @@ def apply_resource(self, resource: KubernetesResource) -> bool:
         self._registry_dict[self._get_key(resource.kind, resource.metadata.name)] = deepcopy(resource)
         return True
 
-    def sync_resources_by_key_prefix(self, resources: List[KubernetesResource]) -> List[KubernetesResource]:
+    def sync_resources_by_key_prefix(self, resources: Iterable[KubernetesResource]) -> List[KubernetesResource]:
         self.delete_resources_by_key_prefix()
 
         for resource in resources:

src/dashboard/apigateway/apigateway/editions/ee/apps/esb/status/es_client.py

@@ -19,7 +19,7 @@
 """
 请求Elasticsearch辅助Client
 """
-from typing import ClassVar
+from typing import ClassVar, Type
 
 from django.conf import settings
 
@@ -28,10 +28,9 @@
 
 
 class BaseSearchClient:
-
     _es_index = settings.BK_ESB_ACCESS_LOG_CONFIG["es_index"]
     _es_time_field_name = settings.BK_ESB_ACCESS_LOG_CONFIG["es_time_field_name"]
-    _es_client_class: ClassVar[BaseESClient]
+    _es_client_class: ClassVar[Type[BaseESClient]]
 
     def __init__(self):
         self._es_client = self._es_client_class(self._es_index)

src/dashboard/apigateway/apigateway/tests/apps/docs/esb/component/test_views.py

@@ -19,9 +19,9 @@
 from unittest.mock import MagicMock
 
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.esb.component import views
+from apigateway.tests.utils.testing import get_response_json
 
 
 class TestAPIViewSet:

src/dashboard/apigateway/apigateway/tests/apps/docs/esb/doc/test_views.py

@@ -17,9 +17,9 @@
 # to the current version of the project delivered to anyone in the future.
 #
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.esb.doc import views
+from apigateway.tests.utils.testing import get_response_json
 
 pytestmark = pytest.mark.django_db
 

src/dashboard/apigateway/apigateway/tests/apps/docs/esb/system/test_views.py

@@ -18,9 +18,9 @@
 #
 import pytest
 from django.conf import settings
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.esb.system import views
+from apigateway.tests.utils.testing import get_response_json
 
 pytestmark = pytest.mark.django_db
 

src/dashboard/apigateway/apigateway/tests/apps/docs/gateway/gateway/test_views.py

@@ -17,9 +17,9 @@
 # to the current version of the project delivered to anyone in the future.
 #
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.gateway.gateway import views
+from apigateway.tests.utils.testing import get_response_json
 
 
 class TestGatewayViewSet:

src/dashboard/apigateway/apigateway/tests/apps/docs/gateway/resource/test_views.py

@@ -17,9 +17,9 @@
 # to the current version of the project delivered to anyone in the future.
 #
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.gateway.resource import views
+from apigateway.tests.utils.testing import get_response_json
 
 
 class TestResourceViewSet:

src/dashboard/apigateway/apigateway/tests/apps/docs/gateway/resource_doc/test_constants.py

@@ -15,9 +15,9 @@
 # We undertake not to change the open source license (MIT license) applicable
 # to the current version of the project delivered to anyone in the future.
 #
-from utils.jinja2 import render_to_string
 
 from apigateway.apps.docs.gateway.resource_doc.constants import BKAPI_AUTHORIZATION_DESCRIPTION_ZH
+from apigateway.utils.jinja2 import render_to_string
 
 
 def test_bkapi_authorization_description():

src/dashboard/apigateway/apigateway/tests/apps/docs/gateway/resource_doc/test_views.py

@@ -17,9 +17,9 @@
 # to the current version of the project delivered to anyone in the future.
 #
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.gateway.resource_doc import views
+from apigateway.tests.utils.testing import get_response_json
 
 
 class TestResourceDocViewSet:

src/dashboard/apigateway/apigateway/tests/apps/docs/gateway/sdk/test_views.py

@@ -17,10 +17,10 @@
 # to the current version of the project delivered to anyone in the future.
 #
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.gateway.sdk import views
 from apigateway.apps.docs.gateway.sdk.helpers import DummyResourceForSDK
+from apigateway.tests.utils.testing import get_response_json
 
 
 class TestSDKViewSet:

src/dashboard/apigateway/apigateway/tests/apps/docs/gateway/stage/test_views.py

@@ -17,9 +17,9 @@
 # to the current version of the project delivered to anyone in the future.
 #
 import pytest
-from tests.utils.testing import get_response_json
 
 from apigateway.apps.docs.gateway.stage import views
+from apigateway.tests.utils.testing import get_response_json
 
 
 class TestStageViewSet: