cesnet-datazoo 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

cesnet_datazoo/config.py

@@ -8,6 +8,7 @@ import warnings
 from dataclasses import InitVar, field
 from datetime import datetime
 from enum import Enum
+from importlib.metadata import version
 from typing import TYPE_CHECKING, Callable, Literal, Optional
 
 import yaml
@@ -83,6 +84,7 @@ class DataLoaderOrder(Enum):
 
 @dataclass(frozen=True)
 class TrainDataParams():
+    datazoo_version: str
     database_filename: str
     train_period_name: str
     train_tables_paths: list[str]
@@ -97,6 +99,7 @@ class TrainDataParams():
 
 @dataclass(frozen=True)
 class TestDataParams():
+    datazoo_version: str
     database_filename: str
     test_period_name: str
     test_tables_paths: list[str]
@@ -497,14 +500,12 @@ class DatasetConfig():
         return params_hash
 
     def _get_train_data_path(self) -> str:
-        if self.need_train_set:
-            params_hash = self._get_train_data_hash()
-            return os.path.join(self.data_root, "train-data", f"{params_hash}_{self.random_state}", f"fold_{self.fold_id}")
-        else:
-            return os.path.join(self.data_root, "train-data", "default")
+        params_hash = self._get_train_data_hash()
+        return os.path.join(self.data_root, "train-data", f"{params_hash}_{self.random_state}", f"fold_{self.fold_id}")
 
     def _get_train_data_params(self) -> TrainDataParams:
         return TrainDataParams(
+            datazoo_version=version("cesnet_datazoo"),
             database_filename=self.database_filename,
             train_period_name=self.train_period_name,
             train_tables_paths=self._get_train_tables_paths(),
@@ -520,6 +521,7 @@ class DatasetConfig():
     def _get_val_data_params_and_path(self, known_apps: list[str], unknown_apps: list[str]) -> tuple[TestDataParams, str]:
         assert self.val_approach == ValidationApproach.VALIDATION_DATES
         val_data_params = TestDataParams(
+            datazoo_version=version("cesnet_datazoo"),
             database_filename=self.database_filename,
             test_period_name=self.val_period_name,
             test_tables_paths=self._get_val_tables_paths(),
@@ -532,6 +534,7 @@ class DatasetConfig():
 
     def _get_test_data_params_and_path(self, known_apps: list[str], unknown_apps: list[str]) -> tuple[TestDataParams, str]:
         test_data_params = TestDataParams(
+            datazoo_version=version("cesnet_datazoo"),
             database_filename=self.database_filename,
             test_period_name=self.test_period_name,
             test_tables_paths=self._get_test_tables_paths(),

{cesnet_datazoo-0.1.5.dist-info → cesnet_datazoo-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cesnet-datazoo
-Version: 0.1.5
+Version: 0.1.7
 Summary: A toolkit for large network traffic datasets
 Author-email: Jan Luxemburk <luxemburk@cesnet.cz>, Karel Hynek <hynekkar@cesnet.cz>
 Maintainer-email: Jan Luxemburk <luxemburk@cesnet.cz>, Karel Hynek <hynekkar@cesnet.cz>
@@ -18,14 +18,14 @@ Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: cesnet-models
 Requires-Dist: matplotlib
-Requires-Dist: numpy
+Requires-Dist: numpy <2.0
 Requires-Dist: pandas
 Requires-Dist: pydantic >=2.0
 Requires-Dist: PyYAML
 Requires-Dist: requests
 Requires-Dist: scikit-learn
 Requires-Dist: seaborn
-Requires-Dist: tables >=3.8.0
+Requires-Dist: tables <=3.9.2,>=3.8.0
 Requires-Dist: torch >=1.10
 Requires-Dist: tqdm
 Provides-Extra: dev

{cesnet_datazoo-0.1.5.dist-info → cesnet_datazoo-0.1.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cesnet_datazoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cesnet_datazoo/config.py,sha256=x8bugBZmBZ9PNd0D5TNHLPHbvx4ZTCQGwQzXPypenjc,38406
+cesnet_datazoo/config.py,sha256=wkpD_OL3gRXX2t0WDfDMsBD2A3vEdAjSm4yXhzsR8T0,38536
 cesnet_datazoo/constants.py,sha256=6GhcIyjVnWYrVnxRgTlGuiWRtvwZL1KqyzMJS26ge2E,1481
 cesnet_datazoo/datasets/__init__.py,sha256=8ziQ3EUzUh5fMfWWXwk0cqYk0lOUNU7zbi0Gom3bLnI,443
 cesnet_datazoo/datasets/cesnet_dataset.py,sha256=14uKWWSGIkH3GM_BDUSYyCIoOh1L-I4bH0zu0m3DkkQ,46988
@@ -23,8 +23,8 @@ cesnet_datazoo/utils/class_info.py,sha256=H5UgyRqXIepBJmkLQ1gAIXV4owKSoIllguRiqF
 cesnet_datazoo/utils/download.py,sha256=hG5V1ZYZGtqCzlVV76NMgOZkSKOywdOFiq9Lagkgego,1441
 cesnet_datazoo/utils/fileutils.py,sha256=XA_VWDuTiCXnoOgHPUzsmbnLFgrlxOo5cvUY_OBJUR8,642
 cesnet_datazoo/utils/random.py,sha256=Dqgm_T25ljbew-OJozK90PsiXKnd4Kw6lcUexxF6vIc,575
-cesnet_datazoo-0.1.5.dist-info/LICENCE,sha256=69Wc69APiM1YKrFOIipG7jjU2lk89WQuO_U0AXKU8KE,1541
-cesnet_datazoo-0.1.5.dist-info/METADATA,sha256=81_DLVvxQ_dBMZR0c9F3rIMvX6KSlIgi0D0fRiupmek,12964
-cesnet_datazoo-0.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cesnet_datazoo-0.1.5.dist-info/top_level.txt,sha256=bu1Z8zaI_1Id_ZaYyvJnxIBa87OSrdlZ8J2OBMggK5o,15
-cesnet_datazoo-0.1.5.dist-info/RECORD,,
+cesnet_datazoo-0.1.7.dist-info/LICENCE,sha256=69Wc69APiM1YKrFOIipG7jjU2lk89WQuO_U0AXKU8KE,1541
+cesnet_datazoo-0.1.7.dist-info/METADATA,sha256=liRSUJ7SSMOvK-_XsFft-Q9XwzqRSkAh4GFw-oIQCgw,12977
+cesnet_datazoo-0.1.7.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+cesnet_datazoo-0.1.7.dist-info/top_level.txt,sha256=bu1Z8zaI_1Id_ZaYyvJnxIBa87OSrdlZ8J2OBMggK5o,15
+cesnet_datazoo-0.1.7.dist-info/RECORD,,

{cesnet_datazoo-0.1.5.dist-info → cesnet_datazoo-0.1.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any