jupyter-analysis-tools 1.4.0__py3-none-any.whl → 1.4.3__py3-none-any.whl

jupyter_analysis_tools/__init__.py

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

jupyter_analysis_tools/utils.py

@@ -106,27 +106,74 @@ def addEnvScriptsToPATH():
         os.environ["PATH"] = sep.join(environPATH)
 
 
-def networkdriveMapping(cmdOutput: str = None):
+def networkdriveMapping(cmdOutput: str = None, resolveNames: bool = True):
     """Returns a dict of mapping drive letters to network paths (on Windows)."""
     if isWindows():
         if cmdOutput is None:
             proc = subprocess.run(["net", "use"], capture_output=True, text=True, encoding="cp850")
             cmdOutput = proc.stdout
+
+        def resolveFQDN(uncPath):
+            if not resolveNames:
+                return uncPath
+            parts = uncPath.split("\\")
+            idx = [i for i, part in enumerate(parts) if len(part)][0]
+            proc = subprocess.run(
+                ["nslookup", parts[idx]], capture_output=True, text=True, encoding="cp850"
+            )
+            res = [line.split() for line in proc.stdout.splitlines() if line.startswith("Name:")]
+            if len(res) and len(res[0]) == 2:
+                parts[idx] = res[0][1]
+            return "\\".join(parts)
+
         rows = [line.split() for line in cmdOutput.splitlines() if "Windows Network" in line]
-        rows = dict(
-            [row[1:3] for row in rows if row[1].endswith(":") and row[2].startswith("\\\\")]
-        )
+        rows = {
+            row[1]: resolveFQDN(row[2])
+            for row in rows
+            if row[1].endswith(":") and row[2].startswith(r"\\")
+        }
         return rows
+    else:  # Linux (tested) or macOS (untested)
+        if cmdOutput is None:
+            proc = subprocess.run(["mount"], capture_output=True, text=True)
+            cmdOutput = proc.stdout
+
+        def parse(line):
+            # position of last opening parenthesis, start of options list
+            lastParen = list(i for i, c in enumerate(line) if "(" == c)[-1]
+            line = line[:lastParen].strip()
+            spaces = list(i for i, c in enumerate(line) if " " == c)
+            fstype = line[spaces[-1] :].strip()  # last remaining word is the filesystem type
+            line = line[: spaces[-2]].strip()  # strip the 'type' indicator as well
+            sepIdx = line.find(" on /")  # separates destination from mount point
+            dest = line[:sepIdx].strip()
+            mountpoint = line[sepIdx + 4 :].strip()
+            yield (mountpoint, dest, fstype)
+
+        return {
+            mp: dst
+            for line in cmdOutput.strip().splitlines()
+            for (mp, dst, fstype) in parse(line)
+            if fstype in ("nfs", "cifs", "sshfs", "afs", "ext4")
+        }
     return {}
 
 
-def makeNetworkdriveAbsolute(filepath, cmdOutput: str = None):
+def makeNetworkdriveAbsolute(filepath, cmdOutput: str = None, resolveNames: bool = True):
     """Replaces the drive letter of the given path by the respective network path, if possible."""
-    if isWindows() and not filepath.drive.startswith(r"\\"):
-        drivemap = networkdriveMapping(cmdOutput=cmdOutput)
+    if filepath.drive.startswith(r"\\"):
+        return filepath  # it's a UNC path already
+    if isWindows():
+        drivemap = networkdriveMapping(cmdOutput=cmdOutput, resolveNames=resolveNames)
         prefix = drivemap.get(filepath.drive, None)
         if prefix is not None:
             filepath = Path(prefix).joinpath(*filepath.parts[1:])
+    else:  # Linux or macOS
+        drivemap = networkdriveMapping(cmdOutput=cmdOutput, resolveNames=resolveNames)
+        # search for the mountpoint, starting with the longest, most specific, first
+        for mp, target in sorted(drivemap.items(), key=lambda tup: len(tup[0]), reverse=True):
+            if filepath.is_relative_to(mp):
+                return Path(target).joinpath(filepath.relative_to(mp))
     return filepath
 
 
@@ -152,7 +199,7 @@ def extract7z(fn, workdir=None):
     assert os.path.isfile(os.path.join(workdir, fn)), "Provided 7z archive '{}' not found!".format(
         fn
     )
-    print(f"Extracting '{fn}':")
+    print(f"Extracting '{fn}': ")
     proc = subprocess.run(
         ["7z", "x", fn],
         cwd=workdir,
@@ -185,7 +232,7 @@ def setPackage(globalsdict):
         sys.path.insert(0, searchpath)
     globalsdict["__package__"] = path.name
     globalsdict["__name__"] = path.name
-    print(f"Setting the current directory as package '{path.name}':\n  {path}.")
+    print(f"Setting the current directory as package '{path.name}': \n  {path}.")
 
 
 def grouper(iterable, n, fillvalue=None):

{jupyter_analysis_tools-1.4.0.dist-info → jupyter_analysis_tools-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyter-analysis-tools
-Version: 1.4.0
+Version: 1.4.3
 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
@@ -35,10 +35,10 @@ Requires-Dist: matplotlib
 Requires-Dist: ipywidgets
 Dynamic: license-file
 
-# Jupyter Analysis Tools (v1.4.0)
+# Jupyter Analysis Tools (v1.4.3)
 
 [![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.4.0.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.0...main)
+[![Commits since latest release](https://img.shields.io/github/commits-since/BAMresearch/jupyter-analysis-tools/v1.4.3.svg)](https://github.com/BAMresearch/jupyter-analysis-tools/compare/v1.4.3...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 +97,28 @@ are installed:
 
 # CHANGELOG
 
+## v1.4.3 (2025-08-01)
+
+### Bug fixes
+
+* **utils**: makeNetworkdriveAbsolute() should return input path if no changes needed ([`2ec96d7`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/2ec96d7066a3473c6d27a6e6d01c640f6c142346))
+
+## v1.4.2 (2025-08-01)
+
+### Bug fixes
+
+* **utils**: makeNetworkdriveAbsolute() with FQDN resolution ([`f4591fb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/f4591fb46dcfeafbb1f63c4323efbb8aea302a92))
+
+## v1.4.1 (2025-08-01)
+
+### Bug fixes
+
+* **utils**: networkdriveMapping() for Linux, with tests ([`3f4deeb`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/3f4deebdf57cc9162121c26d5d7d8484f1f0ec63))
+
+### Testing
+
+* **utils**: remove debug output, should work now ([`1117c89`](https://github.com/BAMresearch/jupyter-analysis-tools/commit/1117c89d4206c6880373e3b8765dff6e48d3ccd5))
+
 ## v1.4.0 (2025-07-28)
 
 ### Continuous integration

{jupyter_analysis_tools-1.4.0.dist-info → jupyter_analysis_tools-1.4.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jupyter_analysis_tools/__init__.py,sha256=WrJsVr7LphomlndzM1P8cM0PpA9EGg9DefUq-Sk2GqM,398
+jupyter_analysis_tools/__init__.py,sha256=ZWwqIRGKVRxOwNMzr6UyicWL5Y9elQGg373dGP1Mq08,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
@@ -6,11 +6,11 @@ jupyter_analysis_tools/distrib.py,sha256=uyh2jXDdXR6dfd36CAoE5_psoFF0bfA6l1wletP
 jupyter_analysis_tools/git.py,sha256=mqSk5nnAFrmk1_2KFuKVrDWOkRbGbAQOq2N1DfxhNpg,2216
 jupyter_analysis_tools/plotting.py,sha256=X5Orrwiof-9MuYMKDJEXIlIt0K6bQT6ktFFjXKIVApI,1962
 jupyter_analysis_tools/readdata.py,sha256=kHbGh7sp3lbpxuHASmCUVZsfH45JCIxMzgSnbq-Pgoo,6883
-jupyter_analysis_tools/utils.py,sha256=tPKmxZytgSCzopDpv6YcTr5EBiXj_-dnjPM9iUOnvgY,6556
+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.4.0.dist-info/licenses/AUTHORS.rst,sha256=-twUESsY0XqFQ0MIC0ylKhglNwL8lyHmGXriM3RF-2s,93
-jupyter_analysis_tools-1.4.0.dist-info/licenses/LICENSE,sha256=jRVl3hmCq0Qv1wifm-EelEKhFWecdoWdhcxSte4a1_c,1125
-jupyter_analysis_tools-1.4.0.dist-info/METADATA,sha256=6L8JnF7qjkcZXnoQYK5js7yqZwjY3pkR5sil6isACLg,43853
-jupyter_analysis_tools-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jupyter_analysis_tools-1.4.0.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
-jupyter_analysis_tools-1.4.0.dist-info/RECORD,,
+jupyter_analysis_tools-1.4.3.dist-info/licenses/AUTHORS.rst,sha256=-twUESsY0XqFQ0MIC0ylKhglNwL8lyHmGXriM3RF-2s,93
+jupyter_analysis_tools-1.4.3.dist-info/licenses/LICENSE,sha256=jRVl3hmCq0Qv1wifm-EelEKhFWecdoWdhcxSte4a1_c,1125
+jupyter_analysis_tools-1.4.3.dist-info/METADATA,sha256=mwfPFJK0SJL_HGSfjiLbtWfMclgyQufodabdsqhKgu0,44709
+jupyter_analysis_tools-1.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jupyter_analysis_tools-1.4.3.dist-info/top_level.txt,sha256=ei_0x-BF85FLoJ_h67ySwDFowtqus_gI4_0GR466PEU,23
+jupyter_analysis_tools-1.4.3.dist-info/RECORD,,