logs-py 3.0.8__py3-none-any.whl → 3.0.9__py3-none-any.whl

LOGS/Entities/Dataset.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence, Union, cast
 
-from deprecation import deprecated
+from deprecation import deprecated  # type: ignore
 
 from LOGS.Auxiliary.Constants import Constants
 from LOGS.Auxiliary.Decorators import Endpoint, UiEndpoint
@@ -140,6 +140,8 @@ class Dataset(
         connection: Optional[LOGSConnection] = None,
         files: Optional[Sequence[Constants.FILE_TYPE]] = None,
         format: Optional[Union[str, "FormatMinimal"]] = None,
+        pathPrefixToStrip: Optional[str] = None,
+        pathPrefixToAdd: Optional[str] = None,
     ):
         super().__init__(ref=ref, id=id, connection=connection)
 
@@ -169,6 +171,10 @@ class Dataset(
                 )
 
             self._files = FileEntry.entriesFromFiles(files)
+            if self._files is not None:
+                for file in self._files:
+                    if pathPrefixToStrip and file.path:
+                        file.modifyPathPrefix(pathPrefixToStrip, pathPrefixToAdd)
 
     def fromDict(self, ref) -> None:
         if isinstance(ref, dict):
@@ -476,14 +482,6 @@ class Dataset(
     def dateAdded(self, value):
         self._dateAdded = self.checkAndConvertNullable(value, datetime, "dateAdded")
 
-    @property
-    def isDeleted(self) -> Optional[bool]:
-        return self._isDeleted
-
-    @isDeleted.setter
-    def isDeleted(self, value):
-        self._isDeleted = self.checkAndConvertNullable(value, bool, "isDeleted")
-
     @property
     def other(self) -> Optional[str]:
         return self._other

LOGS/Entities/FileEntry.py

@@ -28,6 +28,8 @@ class FileEntry(SerializableClass):
     _typeMapper = {"fragments": FingerprintFragment}
     _noSerialize = ["isDir", "name"]
     id: Optional[str] = None
+    # The naming here is confusing. FullPath is part of the LOGS API but it refers
+    # to the full path in LOGS and not the actual file path.
     fullPath: str = ""
     path: str = ""
     isDir: bool = False
@@ -43,37 +45,42 @@ class FileEntry(SerializableClass):
         fullPath: Optional[str] = None,
         state: Optional[FormatFileState] = None,
     ):
-        _path: str = ""
-        if isinstance(ref, (str, os.DirEntry, FileEntry)):
-            if isinstance(ref, FileEntry):
-                _path = ref.path
-                ref = ref.fullPath
-            elif isinstance(ref, os.DirEntry) and ref.path:
-                _path = ref.path
-
-            _fullPath = os.path.realpath(ref)
-            ref = {
-                "id": uuid.uuid4().hex,
-                "fullPath": _fullPath,
-                "isDir": os.path.isdir(_fullPath),
-                "name": os.path.basename(_fullPath),
-            }
-        super().__init__(ref)
+        if isinstance(ref, FileEntry):
+            super().__init__(self._fieldsFromPath(ref.path))
+            self.fullPath = ref.fullPath
+            self.state = ref.state
+        elif isinstance(ref, os.DirEntry) and ref.path:
+            super().__init__(self._fieldsFromPath(ref.path))
+        elif isinstance(ref, str) or fullPath is not None:
+            super().__init__(
+                self._fieldsFromPath(str(ref if fullPath is None else fullPath))
+            )
+
         if fullPath is not None:
             self.fullPath = fullPath
-        self.path = _path
         if state is not None:
             self.state = state
 
+    @classmethod
+    def _fieldsFromPath(cls, path: str):
+        _path = os.path.realpath(path)
+        return {
+            "id": uuid.uuid4().hex,
+            "fullPath": _path,
+            "path": _path,
+            "isDir": os.path.isdir(_path),
+            "name": os.path.basename(_path),
+        }
+
     def __str__(self):
         return "<%s %s%a>" % (
             type(self).__name__,
             ("<dir> " if self.isDir else ""),
-            self.fullPath,
+            self.path,
         )
 
     def addFragment(self, fragments: List[FingerprintFragment]):
-        with open(self.fullPath, "rb") as read:
+        with open(self.path, "rb") as read:
             if self.fragments is None:
                 self.fragments = []
             for fragment in fragments:
@@ -84,11 +91,11 @@ class FileEntry(SerializableClass):
                 self.fragments.append(fragment)
 
     def addHash(self):
-        with open(self.fullPath, "rb") as read:
+        with open(self.path, "rb") as read:
             self.hash = sha256(read.read()).hexdigest()
 
     def addMtime(self):
-        self.mtime = datetime.fromtimestamp(os.path.getmtime(self.fullPath))
+        self.mtime = datetime.fromtimestamp(os.path.getmtime(self.path))
 
     @classmethod
     def entriesFromFiles(
@@ -108,16 +115,22 @@ class FileEntry(SerializableClass):
             if isinstance(file, (str, os.DirEntry, FileEntry)):
                 f = FileEntry(file)
                 if f.isDir:
-                    with os.scandir(f.fullPath) as entries:
+                    with os.scandir(f.path) as entries:
                         files.extend(entries)
                 else:
-                    if not os.path.isfile(f.fullPath) or not os.access(
-                        f.fullPath, os.R_OK
-                    ):
+                    if not os.path.isfile(f.path) or not os.access(f.path, os.R_OK):
                         if not ignoreReadErrors:
-                            raise PermissionError("Could not read file %a" % f.fullPath)
+                            raise PermissionError("Could not read file %a" % f.path)
                     else:
-                        f.id = f.fullPath
+                        f.id = uuid.uuid4().hex
                         result.append(f)
 
         return result
+
+    def modifyPathPrefix(
+        self, prefixToStrip: Optional[str] = None, prefixToAdd: Optional[str] = None
+    ):
+        if prefixToStrip and self.fullPath.startswith(prefixToStrip):
+            self.fullPath = self.fullPath[len(prefixToStrip) :]
+        if prefixToAdd and not self.fullPath.startswith(prefixToAdd):
+            self.fullPath = os.path.join(prefixToAdd, self.fullPath)

LOGS/Entities/Inventory.py

@@ -38,7 +38,6 @@ class Inventory(
     _rootCustomType: Optional["InventoryMinimal"] = None
     _isRootItem: Optional[bool] = None
     _isHierarchyItem: Optional[bool] = None
-    _isDeleted: Optional[bool] = None
     _ancestors: Optional[List["InventoryMinimal"]] = None
     _parent: Optional["InventoryMinimal"] = None
 
@@ -70,14 +69,6 @@ class Inventory(
             value, bool, "isHierarchyItem"
         )
 
-    @property
-    def isDeleted(self) -> Optional[bool]:
-        return self._isDeleted
-
-    @isDeleted.setter
-    def isDeleted(self, value):
-        self._isDeleted = self.checkAndConvertNullable(value, bool, "isDeleted")
-
     @property
     def ancestors(self) -> Optional[List["InventoryMinimal"]]:
         return self._ancestors

LOGS/Entity/Entity.py

@@ -144,7 +144,7 @@ class Entity(ConnectedEntity):
             self._endpoint + [self.id], parameters={"deletePermanently": permanently}
         )
         if hasattr(self, "isDeleted"):
-            self.isDeleted = True
+            setattr(self, "isDeleted", True)
 
         if permanently:
             self.connection = None

LOGS/LOGSConnection.py

@@ -370,7 +370,7 @@ class LOGSConnection:
             content: Any = ""
             if isinstance(entry.content, FileEntry):
                 # content = entry.content.toJson(compact=True)
-                with open(entry.content.fullPath, "rb") as read:
+                with open(entry.content.path, "rb") as read:
                     content = read.read()
             else:
                 content = json.dumps(entry.content)

{logs_py-3.0.8.dist-info → logs_py-3.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: logs-py
-Version: 3.0.8
+Version: 3.0.9
 Summary: A python interface for the LOGS public API
 Home-page: https://docs.logs-python.com
 Author: Sina Kazemi

{logs_py-3.0.8.dist-info → logs_py-3.0.9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 LOGS/LOGS.py,sha256=c596CnYdNeyRcuuqHzoBjFaHspbtp8LatoqkQx6GDYY,44548
-LOGS/LOGSConnection.py,sha256=T8C9vTk4nyy0qJjs3Ee2_pkFyDPMoKapOGTUszP_htY,21581
+LOGS/LOGSConnection.py,sha256=lsp0J4KvovJogDzBy89uc9KC4kT72_U3_rMJyFjnAAE,21577
 LOGS/LOGSOptions.py,sha256=eDymNMLvms_DcM_71poUxcn7FkUH5K-zSZw28gMsVzs,271
 LOGS/ServerMetaData.py,sha256=8D5jl3JVDT-1aV0P8mBddYORWwiRO-ohfKviIOvuA_Y,3358
 LOGS/__init__.py,sha256=zFHOekiFfVI2SnyMhBJCCofrKTn1gXXC-rUk8A9mRw4,260
@@ -53,7 +53,7 @@ LOGS/Entities/DataSourceRelations.py,sha256=eIszpHjZqz6v4WyhaPNu8efSzedsJLNrYR9b
 LOGS/Entities/DataSourceRequestParameter.py,sha256=zAfC61NvVt4XO3HhIy1PLViN3AEBJo7Q6Fa_EtyqNvA,1610
 LOGS/Entities/DataSourceStatus.py,sha256=LIMesU020i1clMiTxvO3hAoESf4B1-fXsDGMMtWLdsM,427
 LOGS/Entities/DataSources.py,sha256=UU5ey98_vX4WQknyWITMy-dPOV-wgjblXxu5uXpnVso,481
-LOGS/Entities/Dataset.py,sha256=VTelbPwxSpLsX6Fu4-4flBFClKtEjLXfiVDC-8uwU-Q,27417
+LOGS/Entities/Dataset.py,sha256=qKIEGuIaBy5SFSzUAckBFk5ACm7xxsl8nVcu9gydQhk,27523
 LOGS/Entities/DatasetCreator.py,sha256=GJ2e0pcYt5ziVqREViBM_uq45K3rm3FG_3NqIOjrO3Y,3253
 LOGS/Entities/DatasetInfo.py,sha256=GVs9dxE2ufMfiuhgKXDcN-GEi2VrZPM1TMBLwtsfMU0,4972
 LOGS/Entities/DatasetMatchTypes.py,sha256=6C60F0GcioNyfRWIIh2XGQJokZxFdBZY9UpKv1y3M7w,4363
@@ -80,7 +80,7 @@ LOGS/Entities/ExperimentMinimal.py,sha256=45NzqBQNwxC96qlEyf8ESLk76ATHem6F765m9s
 LOGS/Entities/ExperimentRelations.py,sha256=NgHv9xbOrsqi7JkExB34-zXsBh5UtZHVv_uheTt-tns,658
 LOGS/Entities/ExperimentRequestParameter.py,sha256=qz0a1JejJ0cAr-oSJVKQGnYSKinQABwdqCFjNQsP9VQ,1248
 LOGS/Entities/Experiments.py,sha256=U9O4JaKpOTui2vWEZ9WeOPHXkI-GMO__vFFYqB5t7Ws,453
-LOGS/Entities/FileEntry.py,sha256=GMg0ABi9Ltdl_jor-1tvMNrP_pjT0tBJdR7KhfqiYlQ,3914
+LOGS/Entities/FileEntry.py,sha256=iJtf_ByBwiCyd5ETXoMOcQG0oTbKviiE2dUwZCJNS74,4556
 LOGS/Entities/FileExcludePattern.py,sha256=LhJfgiKrdTwYhXWBrb0PBMUh4H9vO1dFLFGC2gfHlz8,201
 LOGS/Entities/Format.py,sha256=yH4k1wLyhq09oD0N1SATJN-M4xbAZJLwQV8rMlXYWCA,2377
 LOGS/Entities/FormatFormat.py,sha256=H7uTmPyDZZjAf5IPjx4sTt40rLnigxE-CmWH9n4klFo,1416
@@ -114,7 +114,7 @@ LOGS/Entities/InstrumentRelations.py,sha256=sXlLo_TQiRnkWAOkAAYlYxqquas9KBVEJVW6
 LOGS/Entities/InstrumentRequestParameter.py,sha256=mDPAtXMHVLaYiGnXSUVXGzitG6xFMr75FzCOLD5sUME,1433
 LOGS/Entities/Instruments.py,sha256=0KgCWU5J9nFOM9qQw5s6tRyAdnCzOnjuvAtSwpdbyiU,453
 LOGS/Entities/Inventories.py,sha256=0MluOe-xuNVRqLh6sayaHXM2LMUc43RV7D5b5QOd5Zg,450
-LOGS/Entities/Inventory.py,sha256=Bwf8iqrICieD4t3DM91F17g0nDmHwK4UfkA-1UHuF88,3105
+LOGS/Entities/Inventory.py,sha256=9CWMJChz06KlCgCr2lX-ajMiX0tzCXP--eSMflblIDc,2842
 LOGS/Entities/InventoryMinimal.py,sha256=yunVsM9OiayIHjdwGHM2UxdgaK7fLj2l8Pdurb6zVxI,594
 LOGS/Entities/InventoryRelations.py,sha256=IFlkthKdUcKwFCVz4nxASwtOpog56p2zqoRqjJQZwIE,661
 LOGS/Entities/InventoryRequestParameter.py,sha256=xIL5kGc4mtoVqtsWHDf_IESn_ELMMH9124jq3uGUzTw,1949
@@ -214,7 +214,7 @@ LOGS/Entities/LabNotebookEntryContent/TextMarkConverter.py,sha256=esycxCZBj9-KaP
 LOGS/Entities/LabNotebookEntryContent/TextMarks.py,sha256=CQTyP7xtSTC0__kq9hgdEul2D2XxCoro9koYxnX3HSM,1998
 LOGS/Entities/LabNotebookEntryContent/__init__.py,sha256=VIL4R44IXUOPOADapm1QilZ1uC0g6roAqlOYKAQkLHU,1092
 LOGS/Entity/ConnectedEntity.py,sha256=O3YOGaHArWnk9LPpFIfHBm01PscX7MN5yY3gWpVihRQ,2802
-LOGS/Entity/Entity.py,sha256=WLCtVjRxyRg6nX8UzEMjKJ4MkLICrMmXSo5xrtRHaUE,6300
+LOGS/Entity/Entity.py,sha256=Dx_s0UF0I9gI8HD80ZMeY32mWQkF_1kfdwNGqczNNTU,6311
 LOGS/Entity/EntityConnector.py,sha256=936-3WpUB087u7YxpzR8T3V3HX4RITsOlp5fZWmc8k0,2106
 LOGS/Entity/EntityIterator.py,sha256=EF29TdSvC0rTMMnQgCe5X99mYAYNjZydtLaQc3n7-6k,8165
 LOGS/Entity/EntityMinimal.py,sha256=GysThwk8YbT8xqbHvJqmYKgPf8ckALO5pG-J_SNT0vw,3237
@@ -254,7 +254,7 @@ LOGS/Parameters/ParameterElement.py,sha256=fr6AlO_flKRygZZFx1OILP4P-2lV2Tx4PAe6W
 LOGS/Parameters/ParameterList.py,sha256=ijukB1__iKI5cefmOIIWz0wKaPz9Cx8KpD7Y7Gz2Pn0,1478
 LOGS/Parameters/ParameterTable.py,sha256=7Lew4DPgWmKcpV1T-1Pvt00kEI05FB383QqO-LHAjds,1758
 LOGS/Parameters/__init__.py,sha256=KpMSuBPx964v2YMZ1BqVp8vjrgSpuiW9KYBm-aejRuc,312
-logs_py-3.0.8.dist-info/METADATA,sha256=2ddIR966EkrF9IwiimrJebOpNfYcK_bs3MPGR3MoRo4,2339
-logs_py-3.0.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-logs_py-3.0.8.dist-info/top_level.txt,sha256=Ckn2LiAmGaR7k3tdEnKAc04z_uboMD4gLreYghRNdCs,5
-logs_py-3.0.8.dist-info/RECORD,,
+logs_py-3.0.9.dist-info/METADATA,sha256=C-jyeUN24wtHKYyrBuoJUlF7sNZWRA7_U4iXpu65vKQ,2339
+logs_py-3.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+logs_py-3.0.9.dist-info/top_level.txt,sha256=Ckn2LiAmGaR7k3tdEnKAc04z_uboMD4gLreYghRNdCs,5
+logs_py-3.0.9.dist-info/RECORD,,

{logs_py-3.0.8.dist-info → logs_py-3.0.9.dist-info}/WHEEL

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