Fixed some imports

Author: JaviCerveraIngram

connect/logger/logger.py

@@ -7,8 +7,9 @@
 import json
 import logging
 import os
+
 from logging.config import dictConfig
-from connect.models import BaseModel, Fulfillment
+from connect.models.base import BaseModel
 
 with open(os.path.join(os.path.dirname(__file__), 'config.json')) as config_file:
     config = json.load(config_file)
@@ -23,7 +24,7 @@ def log_request_data(args):
         base = " %(levelname)-6s; %(asctime)s; %(name)-6s; %(module)s:%(funcName)s:line"\
                "-%(lineno)d: %(message)s"
         sformat = args[0].id + base
-        if isinstance(args[0], Fulfillment):
+        if hasattr(args[0], 'asset') and hasattr(args[0].asset, 'id'):
             sformat = args[0].asset.id + "  " + sformat
         [handler.setFormatter(logging.Formatter(sformat, "%I:%M:%S"))
          for handler in logger.handlers]

connect/models/product.py

@@ -11,9 +11,12 @@
 from .customer_ui_settings import CustomerUiSettings
 from .product_category import ProductCategory
 from .product_configuration import ProductConfiguration
+from .product_configuration_parameter import ProductConfigurationParameter
 from .product_stats import ProductStats
 from .schemas import ProductSchema
+from .template import Template
 from connect.config import Config
+from connect.resources.base import ApiClient
 
 
 class Product(BaseModel):
@@ -72,7 +75,6 @@ def get_templates(self, config=None):
         :rtype: List[Template]
         """
         from connect.resources.base import ApiClient
-        from .template import Template
         text, _ = ApiClient(config or Config.get_instance(),
                             'products/' + self.id + '/templates').get()
         return Template.deserialize(text)
@@ -92,8 +94,6 @@ def get_product_configurations(self, filters=None, config=None):
         :return: A list with the product configuration parameter data.
         :rtype: List[ProductConfigurationParameter]
         """
-        from connect.resources.base import ApiClient
-        from .product_configuration_parameter import ProductConfigurationParameter
         text, _ = ApiClient(config or Config.get_instance(),
                             'products/' + self.id + '/configurations').get(params=filters)
         return ProductConfigurationParameter.deserialize(text)

connect/resources/automation_engine.py

@@ -6,7 +6,8 @@
 from typing import Any, Dict
 
 from connect.logger import function_log
-from connect.models import ActivationTileResponse, BaseModel
+from connect.models.activation_tile_response import ActivationTileResponse
+from connect.models.base import BaseModel
 from .base import BaseResource
 from .template import TemplateResource
 

connect/resources/base.py

@@ -12,7 +12,8 @@
 from connect.config import Config
 from connect.exceptions import ServerError
 from connect.logger import function_log, logger
-from connect.models import BaseModel, ServerErrorResponse
+from connect.models.base import BaseModel
+from connect.models.server_error_response import ServerErrorResponse
 
 
 class ApiClient(object):

connect/resources/directory.py

@@ -4,7 +4,9 @@
 # Copyright (c) 2019 Ingram Micro. All Rights Reserved.
 
 from connect.config import Config
-from connect.models import Asset, Product, TierConfig
+from connect.models.asset import Asset
+from connect.models.product import Product
+from connect.models.tier_config import TierConfig
 from connect.resources.base import ApiClient
 
 

connect/resources/fulfillment_automation.py

@@ -10,8 +10,12 @@
 
 from connect.exceptions import FailRequest, InquireRequest, SkipRequest
 from connect.logger import logger, function_log
-from connect.models import ActivationTemplateResponse, ActivationTileResponse, Param, \
-    Fulfillment, TierConfigRequest, Conversation
+from connect.models.activation_template_response import ActivationTemplateResponse
+from connect.models.activation_tile_response import ActivationTileResponse
+from connect.models.param import Param
+from connect.models.fulfillment import Fulfillment
+from connect.models.tier_config_request import TierConfigRequest
+from connect.models.conversation import Conversation
 from .automation_engine import AutomationEngine
 
 

connect/resources/template.py

@@ -5,7 +5,8 @@
 
 from typing import List, Any, Dict
 
-from connect.models import ActivationTemplateResponse, ActivationTileResponse
+from connect.models.activation_template_response import ActivationTemplateResponse
+from connect.models.activation_tile_response import ActivationTileResponse
 from .base import BaseResource
 
 

connect/resources/tier_config_automation.py

@@ -7,8 +7,10 @@
 
 from connect.exceptions import FailRequest, InquireRequest, SkipRequest
 from connect.logger import logger, function_log
-from connect.models import ActivationTemplateResponse, ActivationTileResponse, Param, \
-    TierConfigRequest
+from connect.models.activation_template_response import ActivationTemplateResponse
+from connect.models.activation_tile_response import ActivationTileResponse
+from connect.models.param import Param
+from connect.models.tier_config_request import TierConfigRequest
 from .automation_engine import AutomationEngine
 
 

connect/resources/usage_automation.py

@@ -13,7 +13,9 @@
 
 from connect.exceptions import FileCreationError, FileRetrievalError
 from connect.logger import logger
-from connect.models import UsageListing, UsageFile, UsageRecord
+from connect.models.usage_listing import UsageListing
+from connect.models.usage_file import UsageFile
+from connect.models.usage_record import UsageRecord
 from .automation_engine import AutomationEngine
 
 

connect/resources/usage_file_automation.py

@@ -7,7 +7,8 @@
 
 from connect.exceptions import SkipRequest, UsageFileAction
 from connect.logger import logger
-from connect.models import BaseModel, UsageFile
+from connect.models.base import BaseModel
+from connect.models.usage_file import UsageFile
 from .automation_engine import AutomationEngine