cicwave 0.7.0__tar.gz → 0.7.2__tar.gz

{cicwave-0.7.0/src/cicwave.egg-info → cicwave-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cicwave
-Version: 0.7.0
+Version: 0.7.2
 Summary: Advanced waveform viewer with PyQtGraph backend
 Author-email: Carsten Wulff <carsten@wulff.no>
 License: MIT

{cicwave-0.7.0 → cicwave-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cicwave"
-version = "0.7.0"
+version = "0.7.2"
 authors = [
   { name="Carsten Wulff", email="carsten@wulff.no" },
 ]

{cicwave-0.7.0 → cicwave-0.7.2}/src/cicwave/cli.py

@@ -30,6 +30,7 @@ import os
 import re
 import sys
 import glob as _glob
+import urllib.parse
 import click
 from .command import setup_logging
 
@@ -111,6 +112,23 @@ def _expand_glob_patterns(files, patterns):
     return tuple(out)
 
 
+def _spec_path_of(path):
+    """Lower-cased path part of *path*, with any URL query string cut off."""
+    if _URL_RE.match(path):
+        return urllib.parse.urlsplit(path).path.lower()
+    return path.lower()
+
+
+def _spec_ref(path):
+    """How a spec is recorded for a session: absolute path, or URL as-is.
+
+    ``os.path.abspath`` on an ``http://`` URL yields a local path that
+    names nothing, so a session written from a URL spec could not be
+    read back. Mirrors what ``PgWaveWindow.openSourceSpec`` does.
+    """
+    return path if _URL_RE.match(path) else os.path.abspath(path)
+
+
 def _is_source_spec_file(path):
     """True for a YAML/JSON pivot spec that fetches its own data.
 
@@ -126,8 +144,11 @@ def _is_source_spec_file(path):
     """
     #- Extension check first, so the pandas/Qt import chain behind
     #- apisource is paid for only when a YAML argument is actually given,
-    #- and so a plain data URL is never fetched twice.
-    if not path.lower().endswith((".yaml", ".yml")):
+    #- and so a plain data URL is never fetched twice. Test it against
+    #- the URL's path, not the whole URL: a generated spec is served at
+    #- something like `/spec.yaml?dut=X`, and the rest of cicwave already
+    #- ignores the query string when resolving a format.
+    if not _spec_path_of(path).endswith((".yaml", ".yml")):
         return False
     from .apisource import is_source_spec_file
     return is_source_spec_file(path)
@@ -199,7 +220,7 @@ def _run_catalog_spec(pivot_spec, spec, x, pivot_info_flag,
         c.win.applySession(session_path)
     c.win.browser.openLazyFrame(
         os.path.basename(pivot_spec), groups, catalog.load_group,
-        pivot_spec_path=os.path.abspath(pivot_spec))
+        pivot_spec_path=_spec_ref(pivot_spec))
     c.run()
 
 
@@ -309,7 +330,7 @@ def _run_wave_pg(files, x, sheet, pivot_spec=None,
                 name = "pivot(%s)" % os.path.basename(f)
                 c.openDataFrame(
                     pivoted, name,
-                    pivot_spec_path=os.path.abspath(pivot_spec),
+                    pivot_spec_path=_spec_ref(pivot_spec),
                     original_path=(
                         f if _URL_RE.match(f) else os.path.abspath(f)),
                     source_spec=from_source)
@@ -382,7 +403,8 @@ def main(files, globs, x, sheet, fmt, pivot, pivot_info, session, export,
     advanced visualization of simulation data.
 
     Supports: .raw, .csv, .tsv, .xlsx, .json, .parquet, .feather, .npz,
-    .h5, .pkl, .vcd (digital), .iqvsa (LitePoint), .stdf (ATE), and more.
+    .h5, .pkl, .vcd (digital), .iqvsa (LitePoint), .stdf (ATE),
+    .u32 (raw counter captures), and more.
 
     \b
     URL sources:

{cicwave-0.7.0 → cicwave-0.7.2}/src/cicwave/wave_pg.py

@@ -10,6 +10,7 @@ import math
 import os
 import sys
 import re
+from urllib.parse import urlsplit
 import numpy as np
 import pandas as pd
 from importlib.metadata import version as _pkg_version
@@ -3460,10 +3461,13 @@ class PgWaveWindow(QMainWindow):
         """
         from .apisource import is_source_spec_file
 
-        if path.lower().endswith('.cicwave.yaml'):
+        #- Match on the path part: a spec served by an API can carry a
+        #- query string, which the rest of cicwave already ignores when
+        #- resolving a format.
+        probe = (urlsplit(path).path if _is_url(path) else path).lower()
+        if probe.endswith('.cicwave.yaml'):
             self.applySession(path)
-        elif (path.lower().endswith(('.yaml', '.yml'))
-                and is_source_spec_file(path)):
+        elif probe.endswith(('.yaml', '.yml')) and is_source_spec_file(path):
             self.openSourceSpec(path)
         else:
             self.browser.openFile(path)
@@ -4017,6 +4021,14 @@ class PgWaveWindow(QMainWindow):
                 if getattr(wave, 'show_as_digital', False):
                     wave_dict['digital'] = True
                     wave_dict['digital_format'] = wave.digital_format
+                #- A catalog's waves exist only once their group has been
+                #- fetched, so the session has to say which one to ask
+                #- for; without it the wave is simply not found on load.
+                group = None
+                if hasattr(wave.wfile, 'groupOf'):
+                    group = wave.wfile.groupOf(wave.key)
+                if group is not None:
+                    wave_dict['group'] = group
                 waves.append(wave_dict)
             plot_dict = {'name': tab_name, 'waves': waves}
             if widget.custom_xlabel:
@@ -4063,11 +4075,18 @@ class PgWaveWindow(QMainWindow):
             return
         session = self._build_session()
         session_dir = os.path.dirname(os.path.abspath(fname))
+
+        def _portable(ref):
+            #- A URL is already portable; only a local path is worth
+            #- rewriting relative to where the session is being saved.
+            return ref if _is_url(ref) else os.path.relpath(ref, session_dir)
+
         for fe in session.get('files', []):
-            if not _is_url(fe['path']):
-                fe['path'] = os.path.relpath(fe['path'], session_dir)
-            if 'pivot' in fe:
-                fe['pivot'] = os.path.relpath(fe['pivot'], session_dir)
+            #- A spec that fetches its own data is stored as 'source'
+            #- and has no 'path' at all, so key by what is there.
+            for key in ('path', 'source', 'pivot'):
+                if key in fe:
+                    fe[key] = _portable(fe[key])
 
         with open(fname, 'w') as fh:
             yaml.dump(session, fh, default_flow_style=False, sort_keys=False)
@@ -4097,15 +4116,29 @@ class PgWaveWindow(QMainWindow):
                 fpath = os.path.normpath(os.path.join(session_dir, fpath))
             fmt = fe.get('format')
             pivot_path = fpath if from_source else fe.get('pivot')
-            if pivot_path and not os.path.isabs(pivot_path):
+            if (pivot_path and not _is_url(pivot_path)
+                    and not os.path.isabs(pivot_path)):
                 pivot_path = os.path.normpath(
                     os.path.join(session_dir, pivot_path))
 
             try:
                 if pivot_path:
-                    from .apisource import load_flat_frame
+                    from .apisource import (
+                        LazyCatalog, has_catalog, load_flat_frame)
                     from .pivot import load_spec, apply_pivot
                     spec = load_spec(pivot_path)
+                    spec_ref = (pivot_path if _is_url(pivot_path)
+                                else os.path.abspath(pivot_path))
+                    if from_source and has_catalog(spec):
+                        #- Same as opening the spec directly: the groups
+                        #- are named now and each is fetched when it is
+                        #- plotted. Fetching the lot is what a catalog
+                        #- exists to avoid, session or not.
+                        catalog = LazyCatalog(spec)
+                        self.browser.openLazyFrame(
+                            os.path.basename(fpath), catalog.load(),
+                            catalog.load_group, pivot_spec_path=spec_ref)
+                        continue
                     xaxis = self.browser.xaxis or spec.get('columns', '')
                     if not self.browser.xaxis and spec.get('columns'):
                         self.browser.xaxis = spec['columns']
@@ -4116,7 +4149,7 @@ class PgWaveWindow(QMainWindow):
                     name = "pivot(%s)" % os.path.basename(fpath)
                     self.browser.openDataFrame(
                         pivoted, name,
-                        pivot_spec_path=os.path.abspath(pivot_path),
+                        pivot_spec_path=spec_ref,
                         original_path=(fpath if _is_url(fpath)
                                        else os.path.abspath(fpath)),
                         source_spec=from_source)
@@ -4141,6 +4174,10 @@ class PgWaveWindow(QMainWindow):
             for wd in pd.get('waves', []):
                 wave_name = wd.get('name')
                 style = wd.get('style', 'Lines')
+                #- A wave from a catalog group is not there until that
+                #- group is fetched; one request, not the whole catalog.
+                if wd.get('group'):
+                    self._fetch_session_group(wd['group'])
                 wave = self._find_wave(wave_name)
                 if wave:
                     bits = wd.get('twos_complement_bits')
@@ -4189,6 +4226,19 @@ class PgWaveWindow(QMainWindow):
                     xv = math.log10(xv)
                 p._set_cursor(which[-1], xv)
 
+    def _fetch_session_group(self, group):
+        """Fetch a catalog group a session's plot needs, if still pending."""
+        for wf in self.browser.files.values():
+            if hasattr(wf, 'isPendingGroup') and wf.isPendingGroup(group):
+                try:
+                    wf.loadGroup(group)
+                except Exception as e:
+                    QMessageBox.critical(
+                        self, "Fetch",
+                        "Failed to fetch %s:\n%s" % (group, e))
+                self.browser._fill_waves()
+                return
+
     def _find_wave(self, name):
         """Look up a PgWave by column name across all loaded files."""
         for fkey, wf in self.browser.files.items():

{cicwave-0.7.0 → cicwave-0.7.2}/src/cicwave/wavefiles.py

@@ -470,6 +470,9 @@ class WaveFile():
         self._group_loader = group_loader
         self._pending_groups = list(groups)
         self._loaded_groups = set()
+        #- Which group produced each wave, so a session can name the one
+        #- group it has to fetch to get a plotted wave back.
+        self._group_of = dict()
         self._remote = (not self._virtual) and _is_url(fname)
         self._remote_bytes = None
         self._remote_content_type = None
@@ -1056,10 +1059,19 @@ class WaveFile():
                  if c not in x_columns
                  and (self._df is None or c not in self._df.columns)]
         self._merge_group_frame(frame)
+        #- Every column the fetch brought in, not just the plottable
+        #- ones: a session may name the group's x column too, and it is
+        #- just as absent until the group is fetched.
+        for c in frame.columns:
+            self._group_of.setdefault(c, name)
         for wave in list(self.waves.values()):
             wave.reload()
         return added
 
+    def groupOf(self, name):
+        """The catalog group *name* came from, or None if it stands alone."""
+        return self._group_of.get(name)
+
     def _merge_group_frame(self, frame):
         """Append a fetched group's rows, widening the frame as needed.
 

{cicwave-0.7.0 → cicwave-0.7.2/src/cicwave.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cicwave
-Version: 0.7.0
+Version: 0.7.2
 Summary: Advanced waveform viewer with PyQtGraph backend
 Author-email: Carsten Wulff <carsten@wulff.no>
 License: MIT