bugfixes

Author: harsh97

ads/opctl/backend/marketplace/marketplace_backend_runner.py

@@ -2,12 +2,10 @@
 import sys
 import types
 
-from typing import Dict, List
+from typing import Dict, TYPE_CHECKING
 
-try:
+if TYPE_CHECKING:
     from kubernetes.client import V1ServiceList
-except ImportError:
-    pass
 
 from ads.common.auth import AuthState
 

ads/opctl/backend/marketplace/marketplace_operator_interface.py

@@ -1,12 +1,11 @@
 from abc import ABC, abstractmethod
 from enum import Enum
 
-from typing import Dict
+from typing import Dict, TYPE_CHECKING
 
-try:
+if TYPE_CHECKING:
     from kubernetes.client import V1ServiceList
-except ImportError:
-    pass
+
 from ads.opctl.backend.marketplace.models.marketplace_type import (
     MarketplaceListingDetails,
 )

ads/opctl/backend/marketplace/marketplace_utils.py

@@ -1,6 +1,4 @@
 import os
-import time
-from collections import defaultdict
 import oci
 from typing import List, Dict
 from ads.opctl.backend.marketplace.models.bearer_token import BearerToken
@@ -175,11 +173,11 @@ def __repr__(self):
                 colors=[Color.RED],
             )
 
-    tags_map = _get_tags_map(listing_details)
+    tags_map = _get_tags_map_(listing_details)
 
     if not tags_map:
         _export_helm_chart_(listing_details)
-        tags_map = _get_tags_map(listing_details)
+        tags_map = _get_tags_map_(listing_details)
         if not tags_map:
             raise ImageTagPatternNotFound(pattern=listing_details.container_tag_pattern)
     else:
@@ -200,7 +198,7 @@ def get_kubernetes_service(listings_details: HelmMarketplaceListingDetails):
     )
 
 
-def _get_tags_map(
+def _get_tags_map_(
     listing_details: HelmMarketplaceListingDetails,
 ) -> Dict[str, str]:
     images = list_container_images(

ads/opctl/operator/lowcode/feature_store_marketplace/operator_utils.py

@@ -10,6 +10,7 @@
 
 import oci
 import requests
+from typing import TYPE_CHECKING
 
 try:
     from kubernetes.client import (
@@ -19,7 +20,13 @@
         V1LoadBalancerIngress,
     )
 except ImportError:
-    pass
+    if TYPE_CHECKING:
+        from kubernetes.client import (
+            V1ServiceStatus,
+            V1Service,
+            V1LoadBalancerStatus,
+            V1LoadBalancerIngress,
+        )
 
 from oci.resource_manager.models import StackSummary, AssociatedResourceSummary
 
@@ -223,10 +230,10 @@ def get_api_gw_details(compartment_id: str) -> APIGatewayConfig:
     return apigw_config
 
 
-def get_nlb_id_from_service(service: V1Service, apigw_config: APIGatewayConfig):
-    status: V1ServiceStatus = service.status
-    lb_status: V1LoadBalancerStatus = status.load_balancer
-    lb_ingress: V1LoadBalancerIngress = lb_status.ingress[0]
+def get_nlb_id_from_service(service: "V1Service", apigw_config: APIGatewayConfig):
+    status: "V1ServiceStatus" = service.status
+    lb_status: "V1LoadBalancerStatus" = status.load_balancer
+    lb_ingress: "V1LoadBalancerIngress" = lb_status.ingress[0]
     resource_client = OCIClientFactory(**authutil.default_signer()).create_client(
         oci.resource_search.ResourceSearchClient
     )

tests/unitary/with_extras/operator/feature-store/test_marketplace_utils.py

@@ -6,7 +6,7 @@
     get_docker_bearer_token,
     _export_helm_chart_,
     list_container_images,
-    _get_tags_map,
+    _get_tags_map_,
 )
 
 
@@ -63,6 +63,6 @@ def test_export_helm_chart_to_container_registry(list_api: Mock, export_api: Moc
     )
     listing_details = Mock()
     listing_details.container_tag_pattern = [pattern]
-    result = _get_tags_map(listing_details)
+    result = _get_tags_map_(listing_details)
     assert pattern in result
     assert result[pattern] == f"{pattern}-1"