Avoid circular imports

Author: akx

test/helpers/infra.py

@@ -1,5 +1,8 @@
-from upcloud_api import CloudManager, FirewallRule, IPAddress, Storage, Tag
+from upcloud_api.firewall import FirewallRule
+from upcloud_api.ip_address import IPAddress
 from upcloud_api.server import Server, login_user_block
+from upcloud_api.storage import Storage
+from upcloud_api.tag import Tag
 
 CLUSTER = {
     'web1': Server(

upcloud_api/cloud_manager/base.py

@@ -2,7 +2,7 @@
 
 import requests
 
-from upcloud_api import UpCloudAPIError, __version__
+from upcloud_api.errors import UpCloudAPIError
 
 
 class BaseAPI:
@@ -27,7 +27,7 @@ def request(self, method, endpoint, body=None, params=None, timeout=-1, request_
             raise Exception('Invalid/Forbidden HTTP method')
 
         url = 'https://api.upcloud.com/' + self.api_v + endpoint if request_to_api else endpoint
-        headers = {'Authorization': self.token, 'User-Agent': f'upcloud-python-api/{__version__}'}
+        headers = {'Authorization': self.token, 'User-Agent': self._get_user_agent()}
 
         headers['Content-Type'] = (
             'application/json' if request_to_api else 'application/octet-stream'
@@ -95,3 +95,8 @@ def __error_middleware(self, res, res_json):
             )
 
         return res_json
+
+    def _get_user_agent(self) -> str:
+        from upcloud_api import __version__
+
+        return f'upcloud-python-api/{__version__}'

upcloud_api/cloud_manager/firewall_mixin.py

@@ -1,4 +1,5 @@
-from upcloud_api import FirewallRule, Server
+from upcloud_api.firewall import FirewallRule
+from upcloud_api.server import Server
 
 
 def uuid_and_instance(server):

upcloud_api/cloud_manager/host_mixin.py

@@ -1,4 +1,4 @@
-from upcloud_api import Host
+from upcloud_api.host import Host
 
 
 class HostManager:

upcloud_api/cloud_manager/ip_address_mixin.py

@@ -1,4 +1,4 @@
-from upcloud_api import IPAddress
+from upcloud_api.ip_address import IPAddress
 
 
 class IPManager:

upcloud_api/cloud_manager/network_mixin.py

@@ -1,4 +1,7 @@
-from upcloud_api import Interface, IpNetwork, Network, Router
+from upcloud_api.interface import Interface
+from upcloud_api.ip_network import IpNetwork
+from upcloud_api.network import Network
+from upcloud_api.router import Router
 
 
 class NetworkManager:

upcloud_api/cloud_manager/object_storage_mixin.py

@@ -1,4 +1,4 @@
-from upcloud_api import ObjectStorage
+from upcloud_api.object_storage import ObjectStorage
 from upcloud_api.utils import convert_datetime_string_to_object
 
 

upcloud_api/cloud_manager/server_mixin.py

@@ -1,4 +1,6 @@
-from upcloud_api import IPAddress, Server, Storage
+from upcloud_api.ip_address import IPAddress
+from upcloud_api.server import Server
+from upcloud_api.storage import Storage
 
 
 class ServerManager:

upcloud_api/cloud_manager/storage_mixin.py

@@ -1,4 +1,7 @@
-from upcloud_api import Storage, StorageImport
+from typing import Optional
+
+from upcloud_api.storage import Storage
+from upcloud_api.storage_import import StorageImport
 from upcloud_api.utils import get_raw_data_from_file
 
 

upcloud_api/cloud_manager/tag_mixin.py

@@ -1,4 +1,4 @@
-from upcloud_api import Tag
+from upcloud_api.tag import Tag
 
 
 class TagManager: