jupyter-analysis-tools 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

jupyter_analysis_tools/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # __init__.py
 
-__version__ = "1.6.0"
+__version__ = "1.6.2"
 
 from .binning import reBin
 from .git import checkRepo, isNBstripoutActivated, isNBstripoutInstalled, isRepo

jupyter_analysis_tools/datastore.py

@@ -16,6 +16,7 @@ class DataStore:
     _userspace = None
 
     def __init__(self, url, username=None):
+        self.url = url
         self.username = username
         if self.username is None:
             self.username = getpass.getuser()
@@ -52,13 +53,15 @@ class DataStore:
     def identifier(objects, code):
         return objects[objects.code == code].identifier.tolist()[0]
 
-    def createProject(self, projectName, space, space_prefix=None):
-        """Finds the requested project in the DataStore. If it does not exist,
-        creates a new project with the given code in the given space."""
+    def createProject(self, projectName, space, spacePrefix=None):
+        """Finds the requested project in the DataStore.
+        Matching project names can be limited to a given *spacePrefix*.
+        If the project is not found, a new project with the given code in the given space
+        is created."""
         # get available projects, accessible by the current user
         projectsAvail = self.ds.get_projects()
-        if space_prefix:
-            projectsAvail = [prj for prj in projectsAvail if f"/{space_prefix}_" in prj.identifier]
+        if spacePrefix:
+            projectsAvail = [prj for prj in projectsAvail if f"/{spacePrefix}_" in prj.identifier]
         projects = [prj for prj in projectsAvail if prj.code == projectName]
         assert len(projects) <= 1, f"Multiple projects found for '{projectName}'"
         dsProject = None
@@ -108,23 +111,24 @@ class DataStore:
 
     def createObject(
         self,
-        projectName,
+        projectName: str,
         collectionName: str = None,
-        space=None,
+        space: str = None,
+        spacePrefix: str = None,
         objType: str = None,
         props: dict = None,
     ):
-        dsProject = self.createProject(projectName, space)
+        dsProject = self.createProject(projectName, space, spacePrefix=spacePrefix)
         dsColl = None
         if collectionName is None:  # collectionName is required
             return None
         dsColl = self.createCollection(collectionName, dsProject, defaultObjType=objType)
-        obj = None
         obj = self.ds.get_objects(type=objType, where={"$name": props["$name"]}).objects
         if len(obj):
+            obj = obj[0]
             prefix = objType
             msg = "'{}' exists already in {}! Updating ...".format(
-                obj[0].props["$name"], obj[0].project.identifier
+                obj.props["$name"], obj.project.identifier
             )
             warnings.warn_explicit(msg, UserWarning, prefix, 0)
         else:  # does not exist yet

{jupyter_analysis_tools-1.6.0.dist-info → jupyter_analysis_tools-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.6.0
+Version: 1.6.2
 Summary: Yet another Python library with helpers and utilities for data analysis and processing.
 Author-email: Ingo Breßler <ingo.bressler@bam.de>, "Brian R. Pauw" <brian.pauw@bam.de>
 License-Expression: MIT
@@ -33,12 +33,13 @@ Requires-Dist: scipy
 Requires-Dist: pandas
 Requires-Dist: matplotlib
 Requires-Dist: ipywidgets
+Requires-Dist: pybis
 Dynamic: license-file
 
-# Jupyter Analysis Tools (v1.6.0)
+# Jupyter Analysis Tools (v1.6.2)
 
 [![PyPI Package latest release](https://img.shields.io/pypi/v/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
-[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.0...main)
+[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.6.2.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.2...main)
 [![License](https://img.shields.io/pypi/l/jupyter-analysis-tools.svg)](https://en.wikipedia.org/wiki/MIT_license)
 [![Supported versions](https://img.shields.io/pypi/pyversions/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools)
 [![PyPI Wheel](https://img.shields.io/pypi/wheel/jupyter-analysis-tools.svg)](https://pypi.org/project/jupyter-analysis-tools#files)
@@ -97,6 +98,26 @@ are installed:
 
 # CHANGELOG
 
+## v1.6.2 (2025-09-22)
+
+### Bug fixes
+
+* **Project**: add pybis dependency, for datastore module ([`80350c7`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/80350c7e3f662dd8fa52bbbf46c66104407d930a))
+
+### Code style
+
+* **DataStore**: formatting ([`5afbd91`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/5afbd91080cabe4dea23102a7c9248dc2bee1af4))
+
+## v1.6.1 (2025-09-19)
+
+### Bug fixes
+
+* **DataStore**: regression of handling of existing objects ([`28bd44c`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/28bd44cf019aea0203ad252fd434860f45a1e54a))
+
+* **DataStore**: proper forwarding of spacePrefix for filtering relevant spaces ([`c4117f3`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/c4117f3b04b9f6237f6d8471bef2d76c379e6f11))
+
+* **DataStore**: use the URL provided by constructor ([`fcc46fb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/fcc46fb941006b489054dc492f433e62d77cb605))
+
 ## v1.6.0 (2025-09-19)
 
 ### Bug fixes

{jupyter_analysis_tools-1.6.0.dist-info → jupyter_analysis_tools-1.6.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-jupyter_analysis_tools/__init__.py,sha256=VWuAiXeplG5lYNi9nghWma5zGHb5kEB5Bc5jJQKdoxk,398
+jupyter_analysis_tools/__init__.py,sha256=JwtG0xXgEn0pt0bv4gyH57IlJrEYbAWLVUsWYeKDnak,398
 jupyter_analysis_tools/analysis.py,sha256=AiAvUO648f0PYXqLfal1kDH926neasE5c1RYFu9wtYg,1768
 jupyter_analysis_tools/binning.py,sha256=d6eXRC3IOnnJIF25OfEASyWedT71EX2nF7jAgGJ9suQ,14536
 jupyter_analysis_tools/datalocations.py,sha256=BakfiZOMcBwp-_DAn7l57lGWZmZGNnk0j73V75nLBUA,4322
-jupyter_analysis_tools/datastore.py,sha256=gT7CHviYM-mg2SzWxzt_O_Bf3LaZBmQkpnVvO-ePsGA,6723
+jupyter_analysis_tools/datastore.py,sha256=JZqEr-taNmNLbkDOoaRVP5m-D9t4h1nUTcpkil-7H64,6903
 jupyter_analysis_tools/distrib.py,sha256=uyh2jXDdXR6dfd36CAoE5_psoFF0bfA6l1wletPD7Xo,16515
 jupyter_analysis_tools/git.py,sha256=mqSk5nnAFrmk1_2KFuKVrDWOkRbGbAQOq2N1DfxhNpg,2216
 jupyter_analysis_tools/plotting.py,sha256=X5Orrwiof-9MuYMKDJEXIlIt0K6bQT6ktFFjXKIVApI,1962
@@ -11,10 +11,10 @@ jupyter_analysis_tools/ssfz2json.py,sha256=aEJo8No_PZ021RJGqDz9g2uZVh9y2G-wNvUB7
 jupyter_analysis_tools/ssfz_compare.py,sha256=__6qXALyX5pdUBYSEjzNoVHa470QX8Cg_LASpahtAGI,1557
 jupyter_analysis_tools/utils.py,sha256=c8q2-0v7wEjJ_3w5YTZdjFSf-RP1gPUpMJpv5KUyilU,8800
 jupyter_analysis_tools/widgets.py,sha256=rA8qPvY9nS1OtykZwXtCTG29K-N_MYFVb5Aj8yK40_s,2996
-jupyter_analysis_tools-1.6.0.dist-info/licenses/AUTHORS.rst,sha256=-twUESsY0XqFQ0MIC0ylKhglNwL8lyHmGXriM3RF-2s,93
-jupyter_analysis_tools-1.6.0.dist-info/licenses/LICENSE,sha256=jRVl3hmCq0Qv1wifm-EelEKhFWecdoWdhcxSte4a1_c,1125
-jupyter_analysis_tools-1.6.0.dist-info/METADATA,sha256=YqOXmurH4dIt9raibtSJc1vizocXFKXpB390mLvtgiE,46226
-jupyter_analysis_tools-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jupyter_analysis_tools-1.6.0.dist-info/entry_points.txt,sha256=-LU146dufa_JTwarciGzC6bjsl8pqY_8Z49ODYQ4lPY,124
-jupyter_analysis_tools-1.6.0.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
-jupyter_analysis_tools-1.6.0.dist-info/RECORD,,
+jupyter_analysis_tools-1.6.2.dist-info/licenses/AUTHORS.rst,sha256=-twUESsY0XqFQ0MIC0ylKhglNwL8lyHmGXriM3RF-2s,93
+jupyter_analysis_tools-1.6.2.dist-info/licenses/LICENSE,sha256=jRVl3hmCq0Qv1wifm-EelEKhFWecdoWdhcxSte4a1_c,1125
+jupyter_analysis_tools-1.6.2.dist-info/METADATA,sha256=_Itm52bF7kuLUu4uUqNQBzeb4dNqH3NEGaZmd4bqBok,47210
+jupyter_analysis_tools-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jupyter_analysis_tools-1.6.2.dist-info/entry_points.txt,sha256=-LU146dufa_JTwarciGzC6bjsl8pqY_8Z49ODYQ4lPY,124
+jupyter_analysis_tools-1.6.2.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
+jupyter_analysis_tools-1.6.2.dist-info/RECORD,,