pandahub 0.3.10__zip → 0.3.12__zip

{pandahub-0.3.10 → pandahub-0.3.12}/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.3.11]
+
+    -  IMPROVED: add lib.database_toolbox.get_mongo_client function
+
 ## [0.3.10]
 
     -  BREAKING: changed signatures of create_variant function and route

{pandahub-0.3.10 → pandahub-0.3.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandahub
-Version: 0.3.10
+Version: 0.3.12
 Summary: Data hub for pandapower and pandapipes networks based on MongoDB
 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

{pandahub-0.3.10 → pandahub-0.3.12}/pandahub/lib/PandaHub.py

@@ -23,12 +23,14 @@ import pandapipes as pps
 from pandapipes import from_json_string as from_json_pps, FromSerializableRegistryPpipe
 import pandapower as pp
 import pandapower.io_utils as io_pp
+
 from pandahub.api.internal.settings import MONGODB_URL, MONGODB_USER, MONGODB_PASSWORD, MONGODB_GLOBAL_DATABASE_URL, \
     MONGODB_GLOBAL_DATABASE_USER, MONGODB_GLOBAL_DATABASE_PASSWORD, CREATE_INDEXES_WITH_PROJECT
 from pandahub.lib.database_toolbox import (
     create_timeseries_document,
     convert_timeseries_to_subdocuments,
     convert_element_to_dict,
+    get_mongo_client,
     json_to_object,
     serialize_object_data,
     get_dtypes,
@@ -77,6 +79,7 @@ class PandaHub:
         "read": ["owner", "developer", "guest"],
         "write": ["owner", "developer"],
         "user_management": ["owner"],
+        "delete_project": ["owner"],
     }
 
     # -------------------------
@@ -94,19 +97,9 @@ class PandaHub:
         mongodb_indexes=MONGODB_INDEXES,
         elements_without_vars = None,
     ):
-        mongo_client_args = {
-            "host": connection_url,
-            "uuidRepresentation": "standard",
-            "connect": False,
-        }
-        if connection_user:
-            mongo_client_args |= {
-                "username": connection_user,
-                "password": connection_password,
-            }
         self._datatypes = datatypes
         self.mongodb_indexes = mongodb_indexes
-        self.mongo_client = MongoClient(**mongo_client_args)
+        self.mongo_client = get_mongo_client(connection_url, connection_user, connection_password)
         self.mongo_client_global_db = None
         self.active_project = None
         self.user_id = user_id
@@ -256,7 +249,7 @@ class PandaHub:
         if project_id:
             self.set_active_project_by_id(project_id)
         project_id = self.active_project["_id"]
-        self.check_permission("write")
+        self.check_permission("delete_project")
         if not i_know_this_action_is_final:
             raise PandaHubError(
                 "Calling this function will delete the whole project and all the nets stored within. It can not be reversed. Add 'i_know_this_action_is_final=True' to confirm."
@@ -2682,7 +2675,10 @@ class PandaHub:
             }
             pipeline.append({"$project": projection})
         if not include_metadata:
-            pipeline.append({"$project": {"timeseries_data": 1}})
+            if compressed_ts_data:
+                pipeline.append({"$project": {"timeseries_data": 1, "num_timestamps": 1}})
+            else:
+                pipeline.append({"$project": {"timeseries_data": 1}})
 
         timeseries = []
         for ts in db[collection_name].aggregate(pipeline):
@@ -2690,7 +2686,7 @@ class PandaHub:
                 continue
             data = ts["timeseries_data"]
             if compressed_ts_data:
-                timeseries_data = decompress_timeseries_data(data, ts_format)
+                timeseries_data = decompress_timeseries_data(data, ts_format, ts["num_timestamps"])
                 ts["timeseries_data"] = timeseries_data
             else:
                 if ts_format == "timestamp_value":

{pandahub-0.3.10 → pandahub-0.3.12}/pandahub/lib/database_toolbox.py

@@ -3,6 +3,9 @@ from typing import Optional
 
 import numpy as np
 import pandas as pd
+from pymongo import MongoClient
+
+from pandahub.api.internal.settings import MONGODB_URL, MONGODB_USER, MONGODB_PASSWORD
 from pandahub.lib.datatypes import DATATYPES
 import base64
 import hashlib
@@ -421,3 +424,17 @@ def migrate_userdb_to_beanie(ph):
                  {'$unset': 'id'},
                  {'$out': 'users'}]
     userdb.aggregate(migration)
+
+def get_mongo_client(connection_url=MONGODB_URL, connection_user=MONGODB_USER,
+                     connection_password=MONGODB_PASSWORD) -> MongoClient:
+    mongo_client_args = {
+        "host": connection_url,
+        "uuidRepresentation": "standard",
+        "connect": False,
+    }
+    if connection_user:
+        mongo_client_args |= {
+            "username": connection_user,
+            "password": connection_password,
+        }
+    return MongoClient(**mongo_client_args)

{pandahub-0.3.10 → pandahub-0.3.12}/pandahub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandahub
-Version: 0.3.10
+Version: 0.3.12
 Summary: Data hub for pandapower and pandapipes networks based on MongoDB
 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

{pandahub-0.3.10 → pandahub-0.3.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pandahub"
-version = "0.3.10"  # File format version '__format_version__' is tracked in __init__.py
+version = "0.3.12"  # File format version '__format_version__' is tracked in __init__.py
 authors=[
     { name = "Jan Ulffers", email = "jan.ulffers@iee.fraunhofer.de" },
     { name = "Leon Thurner", email = "leon.thurner@retoflow.de" },