jupyter-analysis-tools 1.6.3__py3-none-any.whl → 1.7.1__py3-none-any.whl

jupyter_analysis_tools/__init__.py

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

jupyter_analysis_tools/datastore.py

@@ -12,10 +12,11 @@ from pybis import Openbis
 
 class DataStore:
     url = None
+    token = None
     _availObj = None
     _userspace = None
 
-    def __init__(self, url, username=None):
+    def __init__(self, url, username=None, tokenValidTo=None):
         self.url = url
         self.username = username
         if self.username is None:
@@ -30,7 +31,9 @@ class DataStore:
             save_token=False,
         )
         # create the PAT with the given name, don't store it
-        self.ds.get_or_create_personal_access_token("test-session")
+        self.token = self.ds.get_or_create_personal_access_token(
+            "test-session", validTo=tokenValidTo
+        )
 
     @property
     def userspace(self):
@@ -118,11 +121,9 @@ class DataStore:
         objType: str = None,
         props: dict = None,
     ):
-        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)
+        assert space and len(space), "space is required!"
+        assert projectName and len(projectName), "projectName is required!"
+        assert collectionName and len(collectionName), "collectionName is required!"
         obj = self.ds.get_objects(type=objType, where={"$name": props["$name"]}).objects
         if len(obj):
             obj = obj[0]
@@ -132,10 +133,13 @@ class DataStore:
             )
             warnings.warn_explicit(msg, UserWarning, prefix, 0)
         else:  # does not exist yet
+            dsProject = self.createProject(projectName, space, spacePrefix=spacePrefix)
+            dsColl = self.createCollection(collectionName, dsProject, defaultObjType=objType)
             objName = f" '{props['$name']}'" if len(props.get("$name", "")) else ""
             print(f"Creating new {objType}{objName} in {dsColl.identifier}")
             obj = self.ds.new_object(type=objType, props=props, collection=dsColl)
         obj.set_props(props)
+        obj.save()
         return obj
 
     def findObjects(self, *args, **kwargs):

{jupyter_analysis_tools-1.6.3.dist-info → jupyter_analysis_tools-1.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.6.3
+Version: 1.7.1
 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
@@ -36,10 +36,10 @@ Requires-Dist: ipywidgets
 Requires-Dist: pybis
 Dynamic: license-file
 
-# Jupyter Analysis Tools (v1.6.3)
+# Jupyter Analysis Tools (v1.7.1)
 
 [![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.3.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.6.3...main)
+[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.7.1.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.7.1...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)
@@ -98,6 +98,22 @@ are installed:
 
 # CHANGELOG
 
+## v1.7.1 (2025-12-11)
+
+### Bug fixes
+
+* **DataStore.createObject(**: attempt to create new project/collection only if object was not found; save it finally as well ([`95fa9e0`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/95fa9e042a26b423936caac64d3e8b115790e888))
+
+## v1.7.0 (2025-12-11)
+
+### Code style
+
+* **DataStore**: line length ([`8741be2`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/8741be28e86990ec18ec946795f2a6b643dcaac6))
+
+### Enh
+
+* **DataStore.init**: remember token and forward how long it should be valid ([`385ecf8`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/385ecf8137bbce46f7ed5266de3596b415e4576c))
+
 ## v1.6.3 (2025-12-04)
 
 ### Bug fixes

{jupyter_analysis_tools-1.6.3.dist-info → jupyter_analysis_tools-1.7.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-jupyter_analysis_tools/__init__.py,sha256=3945twZsXz7DpxSe6LVNL7oxYvQe9Iqiazyx_U0XVWQ,398
+jupyter_analysis_tools/__init__.py,sha256=8H5TrG3I8roNIFxpKDxoPF9tb4cFlQO79NgaKLCWCYo,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=JZqEr-taNmNLbkDOoaRVP5m-D9t4h1nUTcpkil-7H64,6903
+jupyter_analysis_tools/datastore.py,sha256=ZjNIFZ9M5-VPd1JfNeDA2dZfYSPE6-mux-BU6qGpVcE,7131
 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.3.dist-info/licenses/AUTHORS.rst,sha256=-twUESsY0XqFQ0MIC0ylKhglNwL8lyHmGXriM3RF-2s,93
-jupyter_analysis_tools-1.6.3.dist-info/licenses/LICENSE,sha256=jRVl3hmCq0Qv1wifm-EelEKhFWecdoWdhcxSte4a1_c,1125
-jupyter_analysis_tools-1.6.3.dist-info/METADATA,sha256=RBPZpUxP3ajaHTKHh5ipJGchrFogiXkIIYK6zBuHpW8,47410
-jupyter_analysis_tools-1.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jupyter_analysis_tools-1.6.3.dist-info/entry_points.txt,sha256=-LU146dufa_JTwarciGzC6bjsl8pqY_8Z49ODYQ4lPY,124
-jupyter_analysis_tools-1.6.3.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
-jupyter_analysis_tools-1.6.3.dist-info/RECORD,,
+jupyter_analysis_tools-1.7.1.dist-info/licenses/AUTHORS.rst,sha256=-twUESsY0XqFQ0MIC0ylKhglNwL8lyHmGXriM3RF-2s,93
+jupyter_analysis_tools-1.7.1.dist-info/licenses/LICENSE,sha256=jRVl3hmCq0Qv1wifm-EelEKhFWecdoWdhcxSte4a1_c,1125
+jupyter_analysis_tools-1.7.1.dist-info/METADATA,sha256=i9XsIzO3Kji936IQbG24DUrxkW64SppHmmfJ0upz20k,48084
+jupyter_analysis_tools-1.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jupyter_analysis_tools-1.7.1.dist-info/entry_points.txt,sha256=-LU146dufa_JTwarciGzC6bjsl8pqY_8Z49ODYQ4lPY,124
+jupyter_analysis_tools-1.7.1.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
+jupyter_analysis_tools-1.7.1.dist-info/RECORD,,