pandahub 0.3.1__zip → 0.3.3__zip

{pandahub-0.3.1 → pandahub-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandahub
-Version: 0.3.1
+Version: 0.3.3
 Summary: Data hub for pandapower and pandapipes networks based on MongoDB
 Home-page: https://github.com/e2nIEE/pandahub
 Author: Jan Ulffers, Leon Thurner, Jannis Kupka, Mike Vogt, Joschka Thurner, Alexander Scheidler

{pandahub-0.3.1 → pandahub-0.3.3}/pandahub/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.3"
 
 from pandahub.lib.PandaHub import PandaHub, PandaHubError
 from pandahub.client.PandaHubClient import PandaHubClient

{pandahub-0.3.1 → pandahub-0.3.3}/pandahub/api/internal/db.py

@@ -9,6 +9,7 @@ from fastapi_users_db_beanie.access_token import (
     BeanieBaseAccessToken,
 )
 
+from pandahub.api.internal.settings import REGISTRATION_ADMIN_APPROVAL
 from pandahub.api.internal import settings
 from pydantic import Field
 
@@ -22,6 +23,7 @@ db = client["user_management"]
 
 class User(BeanieBaseUser, Document):
     id: uuid.UUID = Field(default_factory=uuid.uuid4)
+    is_active: bool = not REGISTRATION_ADMIN_APPROVAL
     class Settings(BeanieBaseUser.Settings):
         name = "users"
 

{pandahub-0.3.1 → pandahub-0.3.3}/pandahub/api/internal/schemas.py

@@ -7,8 +7,10 @@ from pandahub.api.internal.settings import REGISTRATION_ADMIN_APPROVAL
 class UserRead(schemas.BaseUser[uuid.UUID]):
     pass
 
+
 class UserCreate(schemas.BaseUserCreate):
     is_active: bool = not REGISTRATION_ADMIN_APPROVAL
 
+
 class UserUpdate(schemas.BaseUserUpdate):
     pass

{pandahub-0.3.1 → pandahub-0.3.3}/pandahub/api/internal/settings.py

@@ -47,5 +47,4 @@ SECRET = get_secret("SECRET") or None
 REGISTRATION_ENABLED = settings_bool("REGISTRATION_ENABLED", default=True)
 REGISTRATION_ADMIN_APPROVAL = settings_bool("REGISTRATION_ADMIN_APPROVAL", default=False)
 
-DATATYPES_MODULE = os.getenv("DATATYPES_MODULE") or "pandahub.lib.datatypes"
 CREATE_INDEXES_WITH_PROJECT = settings_bool("CREATE_INDEXES_WITH_PROJECT", default=True)

{pandahub-0.3.1 → pandahub-0.3.3}/pandahub/api/routers/timeseries.py

@@ -7,16 +7,14 @@ from typing import Optional
 
 from pandahub.api.dependencies import pandahub
 
-router = APIRouter(
-    prefix="/timeseries",
-    tags=["timeseries"]
-)
+router = APIRouter(prefix="/timeseries", tags=["timeseries"])
 
 
 # -------------------------------
 #  ROUTES
 # -------------------------------
 
+
 class GetTimeSeriesModel(BaseModel):
     filter_document: Optional[dict] = {}
     global_database: Optional[bool] = False
@@ -57,13 +55,16 @@ class GetTimeseriesMetadataModel(BaseModel):
     project_id: str
     filter_document: Optional[dict] = {}
     global_database: Optional[bool] = False
+    collection_name: Optional[str] = "timeseries"
+
 
 @router.post("/get_timeseries_metadata")
 def get_timeseries_metadata(data: GetTimeseriesMetadataModel, ph=Depends(pandahub)):
     ph.set_active_project_by_id(data.project_id)
     ts = ph.get_timeseries_metadata(
         filter_document=data.filter_document,
-        global_database=data.global_database
+        global_database=data.global_database,
+        collection_name=data.collection_name,
     )
     ts = json.loads(ts.to_json(orient="index"))
     return ts

{pandahub-0.3.1 → pandahub-0.3.3}/pandahub/api/routers/variants.py

@@ -21,11 +21,10 @@ class GetVariantsModel(BaseModel):
 
 @router.post("/get_variants")
 def get_variants(data: GetVariantsModel, ph=Depends(pandahub)):
-    project_id = data.project_id
-    ph.set_active_project_by_id(project_id)
-    db = ph._get_project_database()
+    ph.set_active_project_by_id(data.project_id)
+    variants_collection = ph.get_project_database("variant")
 
-    variants = db["variant"].find({"net_id": data.net_id}, projection={"_id": 0})
+    variants = variants_collection.find({"net_id": data.net_id}, projection={"_id": 0})
     response = {}
     for var in variants:
         response[var.pop("index")] = var