pandahub 0.3.2__zip → 0.3.4__zip

{pandahub-0.3.2 → pandahub-0.3.4}/PKG-INFO

@@ -1,20 +1,62 @@
 Metadata-Version: 2.1
 Name: pandahub
-Version: 0.3.2
+Version: 0.3.4
 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
-Author-email: info@pandapower.de
-Keywords: pandahub
-Classifier: Development Status :: 2 - Pre-Alpha
+Author-email: Jan Ulffers <jan.ulffers@iee.fraunhofer.de>, Leon Thurner <leon.thurner@retoflow.de>, Jannis Kupka <jannis.kupka@retoflow.de>, Mike Vogt <mike.vogt@iee.fraunhofer.de>, Joschka Thurner <joschka.thurner@retoflow.de>, Alexander Scheidler <alexander.scheidler@iee.fraunhofer.de>
+License: Copyright (c) 2022 by University of Kassel, Fraunhofer Institute for Energy Economics
+        and Energy System Technology (IEE) Kassel, retoflow GmbH individual contributors (see AUTHORS file for details).
+        All rights reserved.
+        
+        Redistribution and use in source and binary forms, with or without modification, are permitted 
+        provided that the following conditions are met:
+        
+        1. Redistributions of source code must retain the above copyright notice, this list of conditions
+        and the following disclaimer.
+        
+        2. Redistributions in binary form must reproduce the above copyright notice, this list of
+        conditions and the following disclaimer in the documentation and/or other materials provided
+        with the distribution.
+        
+        3. Neither the name of the copyright holder nor the names of its contributors may be used to 
+        endorse or promote products derived from this software without specific prior written permission.
+        
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR 
+        IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+        DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+        WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+        WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        
+Project-URL: Homepage, https://github.com/e2nIEE/pandahub
+Project-URL: Documentation, https://pandapipes.readthedocs.io
+Project-URL: Source, https://github.com/e2nIEE/pandahub
+Project-URL: Repository, https://github.com/e2nIEE/pandahub.git
+Project-URL: Issues, https://github.com/e2nIEE/pandahub/issues
+Project-URL: Download, https://pypi.org/project/pandahub/#files
+Project-URL: Changelog, https://github.com/e2nIEE/pandahub/blob/develop/CHANGELOG.md
+Keywords: network,analysis,optimization,automation,grid,energy,engineering,simulation
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+Provides-Extra: docs
+Provides-Extra: test
+Provides-Extra: all
 License-File: LICENSE
 License-File: AUTHORS
 

{pandahub-0.3.2 → pandahub-0.3.4}/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.2 → pandahub-0.3.4}/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.2 → pandahub-0.3.4}/pandahub/api/internal/settings.py

@@ -31,14 +31,14 @@ MONGODB_GLOBAL_DATABASE_PASSWORD = get_secret("MONGODB_GLOBAL_DATABASE_PASSWORD"
 if not MONGODB_GLOBAL_DATABASE_URL:
     MONGODB_GLOBAL_DATABASE_URL = os.getenv("MONGODB_URL_GLOBAL_DATABASE") or None
 
-EMAIL_VERIFICATION_REQUIRED = settings_bool("EMAIL_VERIFICATION_REQUIRED")
+EMAIL_VERIFICATION_REQUIRED = settings_bool("EMAIL_VERIFICATION_REQUIRED", default=False)
 
 MAIL_USERNAME = os.getenv("MAIL_USERNAME") or "dummy@mail.de"
 MAIL_PASSWORD = os.getenv("MAIL_PASSWORD") or ""
 MAIL_PORT = os.getenv("MAIL_PORT") or 587
 MAIL_SMTP_SERVER = os.getenv("MAIL_SMTP_SERVER") or ""
-MAIL_STARTTLS = os.getenv("MAIL_STARTTLS") or True
-MAIL_SSL_TLS = os.getenv("MAIL_SSL_TLS") or False
+MAIL_STARTTLS = settings_bool("MAIL_STARTTLS", default=True)
+MAIL_SSL_TLS = settings_bool("MAIL_SSL_TLS", default=False)
 
 PASSWORD_RESET_URL = os.getenv("PASSWORD_RESET_URL") or ""
 EMAIL_VERIFY_URL = os.getenv("EMAIL_VERIFY_URL") or ""
@@ -47,5 +47,9 @@ 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)
+
+DEBUG = settings_bool("DEBUG", default=False)
+PANDAHUB_SERVER_URL = os.getenv("PANDAHUB_SERVER_URL", "0.0.0.0")
+PANDAHUB_SERVER_PORT = int(os.getenv('PANDAHUB_SERVER_PORT', 8002))
+WORKERS = int(os.getenv('WORKER', 2))

{pandahub-0.3.2 → pandahub-0.3.4}/pandahub/api/main.py

@@ -8,6 +8,7 @@ from fastapi.responses import JSONResponse
 from pandahub.lib.PandaHub import PandaHubError
 from pandahub.api.routers import net, projects, timeseries, users, auth, variants
 from pandahub.api.internal.db import User, db, AccessToken
+from pandahub.api.internal import settings
 from beanie import init_beanie
 
 @asynccontextmanager
@@ -27,18 +28,19 @@ origins = [
     "http://localhost:8080",
 ]
 
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=origins,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
+if settings.DEBUG:
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=origins,
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
 
 app.include_router(net.router)
 app.include_router(projects.router)
 app.include_router(timeseries.router)
-app.include_router(User.router)
+app.include_router(users.router)
 app.include_router(auth.router)
 app.include_router(variants.router)
 
@@ -50,6 +52,18 @@ async def pandahub_exception_handler(request: Request, exc: PandaHubError):
         content=str(exc),
     )
 
+@app.get("/")
+async def ready():
+    if settings.DEBUG:
+        import os
+        return os.environ
+    return "Hello World!"
+
 
 if __name__ == "__main__":
-    uvicorn.run("main:app", host="127.0.0.1", port=8002, log_level="info", reload=True)
+    uvicorn.run("main:app",
+                host=settings.PANDAHUB_SERVER_URL,
+                port=settings.PANDAHUB_SERVER_PORT,
+                log_level="info",
+                reload=True,
+                workers=settings.WORKERS)

{pandahub-0.3.2 → pandahub-0.3.4}/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

{pandahub-0.3.2 → pandahub-0.3.4}/pandahub/client/PandaHubClient.py

@@ -1,22 +1,27 @@
-import warnings
-
 import requests
 import pandapower as pp
 import pandas as pd
-import numpy as np
 from pathlib import Path
 import os
 import json
 from fastapi.encoders import jsonable_encoder
 
+
 class PandaHubClient:
-    def __init__(self):
-        config = os.path.join(Path.home(), "pandahub.config")
+    def __init__(self, config=None):
+        d = None
+        if config is None:
+            config = os.path.join(Path.home(), "pandahub.config")
+        elif type(config) == dict:
+            d = config
+
         try:
-            with open(config, "r") as f:
-                d = json.load(f)
+            if d is None:
+                with open(config, "r") as f:
+                    d = json.load(f)
         except FileNotFoundError:
             raise UserWarning("No pandahub configuration file found - log in first")
+
         self.url = d["url"]
         self.token = d["token"]
         self.cert = None