Fix with REST

Author: dirkkul

integration/test_tenants.py

@@ -117,15 +117,15 @@ def test_tenants(collection_factory: CollectionFactory) -> None:
 
     tenants = collection.tenants.get()
     assert len(tenants) == 2
-    assert type(tenants["tenant1"]) is Tenant
-    assert type(tenants["tenant2"]) is Tenant
+    assert isinstance(tenants["tenant1"], Tenant)
+    assert isinstance(tenants["tenant2"], Tenant)
     assert tenants["tenant1"].name == "tenant1"
     assert tenants["tenant2"].name == "tenant2"
 
     if collection._connection._weaviate_version.supports_tenants_get_grpc:
         tenants = collection.tenants.get_by_names(tenants=["tenant2"])
         assert len(tenants) == 1
-        assert type(tenants["tenant2"]) is Tenant
+        assert isinstance(tenants["tenant2"], Tenant)
         assert tenants["tenant2"].name == "tenant2"
     else:
         pytest.raises(

weaviate/collections/classes/tenants.py

@@ -84,18 +84,32 @@ def activity_status(self) -> TenantActivityStatus:
         return self.activityStatusInternal
 
     def model_post_init(self, __context: Any) -> None:  # noqa: D102
+        self._model_post_init(user_input=True)
+
+    def _model_post_init(self, user_input: bool) -> None:  # noqa: D102
         if self.activityStatusInternal == TenantActivityStatus.HOT:
-            _Warnings.deprecated_tenant_type("HOT", "ACTIVE")
+            if user_input:
+                _Warnings.deprecated_tenant_type("HOT", "ACTIVE")
             self.activityStatusInternal = TenantActivityStatus.ACTIVE
         elif self.activityStatusInternal == TenantUpdateActivityStatus.COLD:
-            _Warnings.deprecated_tenant_type("COLD", "INACTIVE")
+            if user_input:
+                _Warnings.deprecated_tenant_type("COLD", "INACTIVE")
             self.activityStatusInternal = TenantActivityStatus.INACTIVE
         elif self.activityStatusInternal == TenantUpdateActivityStatus.FROZEN:
-            _Warnings.deprecated_tenant_type("FROZEN", "OFFLOADED")
+            if user_input:
+                _Warnings.deprecated_tenant_type("FROZEN", "OFFLOADED")
             self.activityStatusInternal = TenantActivityStatus.OFFLOADED
-        self.activityStatus = _TenantActivistatusServerValues.from_string(
-            self.activityStatusInternal.value
-        )
+        if user_input:
+            self.activityStatus = _TenantActivistatusServerValues.from_string(
+                self.activityStatusInternal.value
+            )
+
+
+class TenantOutput(Tenant):  # noqa: D101
+    """Wrapper around Tenant for output purposes."""
+
+    def model_post_init(self, __context: Any) -> None:  # noqa: D102
+        self._model_post_init(user_input=False)
 
 
 class TenantCreateActivityStatus(str, Enum):

weaviate/collections/tenants.py

@@ -8,6 +8,7 @@
     TenantActivityStatus,
     TenantCreateActivityStatus,
     TenantUpdateActivityStatus,
+    TenantOutput,
 )
 from weaviate.collections.grpc.tenants import _TenantsGRPC
 from weaviate.connect import ConnectionV4
@@ -152,7 +153,10 @@ def __get_with_rest(self) -> Dict[str, TenantOutputType]:
         )
 
         tenant_resp: List[Dict[str, Any]] = response.json()
-        return {tenant["name"]: Tenant(**tenant) for tenant in tenant_resp}
+        for tenant in tenant_resp:
+            tenant["activityStatusInternal"] = tenant["activityStatus"]
+            del tenant["activityStatus"]
+        return {tenant["name"]: TenantOutput(**tenant) for tenant in tenant_resp}
 
     def __get_with_grpc(
         self, tenants: Optional[Sequence[Union[str, Tenant]]] = None