get rid of cycle-imports

.pylintrc

@@ -441,6 +441,7 @@ good-names=i,
            k,
            ex,
            Run,
+           do,
            _
 
 # Good variable names regexes, separated by a comma. If names match any regex,

weaviate/__init__.py

@@ -42,7 +42,7 @@
     'SchemaValidationException',
 ]
 
-from .auth import AuthClientCredentials, AuthClientPassword
+from .version import __version__
 from .exceptions import *
+from .auth import AuthClientCredentials, AuthClientPassword
 from .client import Client
-from .version import __version__

weaviate/batch/crud_batch.py

@@ -6,7 +6,7 @@
 from numbers import Real
 from typing import Tuple, Callable, Optional, Sequence
 from requests import ReadTimeout, Response
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.connect import Connection
 from .requests import BatchRequest, ObjectsBatchRequest, ReferenceBatchRequest
 

weaviate/classification/classification.py

@@ -2,7 +2,7 @@
 Classification class definition.
 """
 import validators
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.connect import Connection
 from .config_builder import ConfigBuilder
 

weaviate/client.py

@@ -3,15 +3,15 @@
 """
 from typing import Optional, Tuple, Union
 from numbers import Real
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from .auth import AuthCredentials
+from .exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from .connect import Connection
 from .classification import Classification
 from .schema import Schema
 from .contextionary import Contextionary
 from .batch import Batch
 from .data import DataObject
 from .gql import Query
-from .auth import AuthCredentials
 
 
 class Client:

weaviate/connect/connection.py

@@ -7,7 +7,7 @@
 from numbers import Real
 import requests
 from requests import RequestException
-from weaviate import AuthenticationFailedException
+from weaviate.exceptions import AuthenticationFailedException
 from weaviate.auth import AuthCredentials
 from weaviate.util import _get_valid_timeout_config
 

weaviate/contextionary/crud_contextionary.py

@@ -1,7 +1,7 @@
 """
 Contextionary class definition.
 """
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.connect import Connection
 
 

weaviate/data/crud_data.py

@@ -4,9 +4,11 @@
 from typing import Union, Optional, List, Sequence
 import validators
 from weaviate.connect import Connection
-from weaviate import ObjectAlreadyExistsException
-from weaviate import RequestsConnectionError
-from weaviate import UnexpectedStatusCodeException
+from weaviate.exceptions import (
+    ObjectAlreadyExistsException,
+    RequestsConnectionError,
+    UnexpectedStatusCodeException
+)
 from weaviate.util import _get_dict_from_object, get_vector, get_valid_uuid
 from weaviate.data.references import Reference
 

weaviate/data/references/crud_references.py

@@ -3,7 +3,7 @@
 """
 from typing import Union
 from weaviate.connect import Connection
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.util import get_valid_uuid
 
 

weaviate/gql/filter.py

@@ -7,7 +7,7 @@
 from typing import Optional
 from abc import ABC, abstractmethod
 from weaviate.connect import Connection
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.util import get_vector
 
 class GraphQL(ABC):

weaviate/gql/query.py

@@ -3,7 +3,7 @@
 """
 from typing import List, Union
 from weaviate.connect import Connection
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from .get import GetBuilder
 from .aggregate import AggregateBuilder
 

weaviate/schema/crud_schema.py

@@ -4,7 +4,7 @@
 from typing import Union, Optional
 from weaviate.connect import Connection
 from weaviate.util import _get_dict_from_object, _is_sub_schema
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.schema.validate_schema import validate_schema, check_class
 from weaviate.schema.properties import Property
 

weaviate/schema/properties/crud_properties.py

@@ -1,7 +1,7 @@
 """
 Property class definition.
 """
-from weaviate import UnexpectedStatusCodeException, RequestsConnectionError
+from weaviate.exceptions import UnexpectedStatusCodeException, RequestsConnectionError
 from weaviate.schema.validate_schema import check_property
 from weaviate.util import _get_dict_from_object
 from weaviate.connect import Connection

weaviate/schema/validate_schema.py

@@ -2,7 +2,7 @@
 Schema validation module.
 """
 from typing import Any
-from weaviate import SchemaValidationException
+from weaviate.exceptions import SchemaValidationException
 
 
 def validate_schema(schema: dict) -> None:

weaviate/util.py

@@ -4,7 +4,7 @@
 import os
 import json
 import base64
-import uuid
+import uuid as uuid_lib
 from typing import Union, Sequence, Tuple, Any
 from numbers import Real
 from io import BufferedReader
@@ -446,4 +446,4 @@ def generate_uuid5(identifier: Any, namespace: Any = "") -> str:
         The UUID as a string.
     """
 
-    return str(uuid.uuid5(uuid.NAMESPACE_DNS, str(namespace) + str(identifier)))
+    return str(uuid_lib.uuid5(uuid_lib.NAMESPACE_DNS, str(namespace) + str(identifier)))

weaviate/version.py

@@ -2,4 +2,4 @@
 Weaviate-Python-Client version.
 """
 
-__version__ = "3.0.0"
+__version__ = "3.1.0.dev0"

weaviate/wcs/crud_wcs.py

@@ -7,7 +7,7 @@
 import json
 from tqdm import tqdm
 from weaviate.connect import Connection
-from weaviate import RequestsConnectionError, UnexpectedStatusCodeException
+from weaviate.exceptions import RequestsConnectionError, UnexpectedStatusCodeException
 from weaviate.auth import AuthCredentials