Fix breaking public imports from .users/.backups reducing diff

Author: tsmith023

weaviate/outputs/backup.py

@@ -1,4 +1,4 @@
-from weaviate.backup.executor import BackupStatus, BackupStatusReturn, BackupStorage, BackupReturn
+from weaviate.backup.backup import BackupStatus, BackupStatusReturn, BackupStorage, BackupReturn
 
 __all__ = [
     "BackupStatus",

weaviate/outputs/users.py

@@ -1,3 +1,3 @@
-from weaviate.users.executor import UserDB, UserTypes, OwnUser
+from weaviate.users.users import UserDB, UserTypes, OwnUser
 
 __all__ = ["OwnUser", "UserDB", "UserTypes"]

weaviate/users/async_.pyi

@@ -1,7 +1,7 @@
 from typing import Dict, List, Literal, Union, overload
 from weaviate.connect.v4 import ConnectionAsync
 from weaviate.users.executor import _DeprecatedExecutor, _DBExecutor, _OIDCExecutor
-from weaviate.users.executor import UserDB, OwnUser
+from weaviate.users.users import UserDB, OwnUser
 
 from weaviate.rbac.models import Role, RoleBase
 from typing_extensions import deprecated

weaviate/users/executor.py

@@ -1,5 +1,4 @@
-from dataclasses import dataclass
-from typing import Any, Dict, Final, Generic, List, Literal, Optional, Union, cast
+from typing import Any, Dict, Generic, List, Optional, Union, cast
 
 from httpx import Response
 
@@ -11,37 +10,15 @@
     WeaviateDBUserRoleNames,
     UserTypes,
 )
-
+from weaviate.users.users import (
+    USER_TYPE_DB,
+    USER_TYPE_OIDC,
+    USER_TYPE,
+    UserDB,
+    OwnUser,
+)
 from weaviate.util import _decode_json_response_dict
 
-USER_TYPE_DB: Final = "db"
-USER_TYPE_OIDC: Final = "oidc"
-USER_TYPE = Literal["db", "oidc"]
-
-
-@dataclass
-class OwnUser:
-    user_id: str
-    roles: Dict[str, Role]
-
-
-@dataclass
-class UserBase:
-    user_id: str
-    role_names: List[str]
-    user_type: UserTypes
-
-
-@dataclass
-class UserDB(UserBase):
-    user_type: UserTypes
-    active: bool
-
-
-@dataclass
-class UserOIDC(UserBase):
-    user_type: UserTypes = UserTypes.OIDC
-
 
 class _BaseExecutor(Generic[ConnectionType]):
     def __init__(self, connection: ConnectionType):

weaviate/users/sync.pyi

@@ -1,7 +1,7 @@
 from typing import Dict, List, Literal, Union, overload
 from weaviate.connect.v4 import ConnectionSync
 from weaviate.users.executor import _DeprecatedExecutor, _DBExecutor, _OIDCExecutor
-from weaviate.users.executor import UserDB, OwnUser
+from weaviate.users.users import UserDB, OwnUser
 
 from weaviate.rbac.models import Role, RoleBase
 from typing_extensions import deprecated

weaviate/users/users.py

@@ -0,0 +1,35 @@
+from dataclasses import dataclass
+from typing import Dict, Final, List, Literal
+
+from weaviate.rbac.models import (
+    Role,
+    UserTypes,
+)
+
+USER_TYPE_DB: Final = "db"
+USER_TYPE_OIDC: Final = "oidc"
+USER_TYPE = Literal["db", "oidc"]
+
+
+@dataclass
+class OwnUser:
+    user_id: str
+    roles: Dict[str, Role]
+
+
+@dataclass
+class UserBase:
+    user_id: str
+    role_names: List[str]
+    user_type: UserTypes
+
+
+@dataclass
+class UserDB(UserBase):
+    user_type: UserTypes
+    active: bool
+
+
+@dataclass
+class UserOIDC(UserBase):
+    user_type: UserTypes = UserTypes.OIDC