QuLab 2.0.1__tar.gz → 2.0.2__tar.gz

{QuLab-2.0.1 → qulab-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.0.1
+Version: 2.0.2
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -30,10 +30,13 @@ Requires-Dist: dill>=0.3.6
 Requires-Dist: GitPython>=3.1.14
 Requires-Dist: ipython>=7.4.0
 Requires-Dist: ipywidgets>=7.4.2
+Requires-Dist: loguru>=0.7.2
 Requires-Dist: matplotlib>=3.7.2
 Requires-Dist: numpy>=1.13.3
 Requires-Dist: ply>=3.11
+Requires-Dist: pyzmq>=25.1.0
 Requires-Dist: scipy>=1.0.0
+Requires-Dist: watchdog>=4.0.0
 
 # QuLab
 [![View build status](https://travis-ci.org/feihoo87/QuLab.svg?branch=master)](https://travis-ci.org/feihoo87/QuLab)

{QuLab-2.0.1 → qulab-2.0.2}/QuLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuLab
-Version: 2.0.1
+Version: 2.0.2
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -30,10 +30,13 @@ Requires-Dist: dill>=0.3.6
 Requires-Dist: GitPython>=3.1.14
 Requires-Dist: ipython>=7.4.0
 Requires-Dist: ipywidgets>=7.4.2
+Requires-Dist: loguru>=0.7.2
 Requires-Dist: matplotlib>=3.7.2
 Requires-Dist: numpy>=1.13.3
 Requires-Dist: ply>=3.11
+Requires-Dist: pyzmq>=25.1.0
 Requires-Dist: scipy>=1.0.0
+Requires-Dist: watchdog>=4.0.0
 
 # QuLab
 [![View build status](https://travis-ci.org/feihoo87/QuLab.svg?branch=master)](https://travis-ci.org/feihoo87/QuLab)

{QuLab-2.0.1 → qulab-2.0.2}/QuLab.egg-info/SOURCES.txt

@@ -23,12 +23,13 @@ qulab/monitor/ploter.py
 qulab/monitor/qt_compat.py
 qulab/monitor/toolbar.py
 qulab/scan/__init__.py
-qulab/scan/base.py
-qulab/scan/dataset.py
+qulab/scan/curd.py
 qulab/scan/expression.py
+qulab/scan/models.py
 qulab/scan/optimize.py
-qulab/scan/scanner.py
-qulab/scan/transforms.py
+qulab/scan/query_record.py
+qulab/scan/recorder.py
+qulab/scan/scan.py
 qulab/scan/utils.py
 qulab/storage/__init__.py
 qulab/storage/__main__.py
@@ -77,6 +78,7 @@ qulab/sys/rpc/server.py
 qulab/sys/rpc/socket.py
 qulab/sys/rpc/utils.py
 qulab/sys/rpc/worker.py
+qulab/sys/rpc/zmq_socket.py
 qulab/visualization/__init__.py
 qulab/visualization/__main__.py
 qulab/visualization/_autoplot.py
@@ -85,4 +87,4 @@ qulab/visualization/plot_seq.py
 qulab/visualization/qdat.py
 qulab/visualization/widgets.py
 src/qulab.h
-tests/test_scan_iter.py
+tests/test_scan.py

{QuLab-2.0.1 → qulab-2.0.2}/QuLab.egg-info/requires.txt

@@ -4,7 +4,10 @@ dill>=0.3.6
 GitPython>=3.1.14
 ipython>=7.4.0
 ipywidgets>=7.4.2
+loguru>=0.7.2
 matplotlib>=3.7.2
 numpy>=1.13.3
 ply>=3.11
+pyzmq>=25.1.0
 scipy>=1.0.0
+watchdog>=4.0.0

{QuLab-2.0.1 → qulab-2.0.2}/pyproject.toml

@@ -34,10 +34,13 @@ dependencies = [
     "GitPython>=3.1.14",
     "ipython>=7.4.0",
     "ipywidgets>=7.4.2",
+    "loguru>=0.7.2",
     "matplotlib>=3.7.2",
     "numpy>=1.13.3",
     "ply>=3.11",
-    "scipy>=1.0.0"
+    "pyzmq>=25.1.0",
+    "scipy>=1.0.0",
+    "watchdog>=4.0.0"
 ]
 dynamic = ["version"]
 

{QuLab-2.0.1 → qulab-2.0.2}/qulab/__main__.py

@@ -1,6 +1,7 @@
 import click
 
 from .monitor.__main__ import main as monitor
+from .scan.recorder import record
 from .sys.net.cli import dht
 from .visualization.__main__ import plot
 
@@ -19,6 +20,7 @@ def hello():
 main.add_command(monitor)
 main.add_command(plot)
 main.add_command(dht)
+main.add_command(record)
 
 if __name__ == '__main__':
     main()

qulab-2.0.2/qulab/scan/__init__.py

@@ -0,0 +1,3 @@
+from .expression import Expression, Symbol
+from .query_record import get_record, lookup, lookup_list
+from .scan import Scan

qulab-2.0.2/qulab/scan/curd.py

@@ -0,0 +1,144 @@
+from datetime import date, datetime, timezone
+from typing import Sequence, Type, Union
+
+from sqlalchemy.orm import Query, Session, aliased
+from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm.session import Session
+from waveforms.dicttree import foldDict
+
+from .models import Comment, Record, Report, Sample, Tag
+
+
+def tag(session: Session, tag_text: str) -> Tag:
+    """Get a tag from the database or create a new if not exists."""
+    try:
+        return session.query(Tag).filter(Tag.text == tag_text).one()
+    except NoResultFound:
+        tag = Tag(text=tag_text)
+        return tag
+
+
+def tag_it(session: Session, tag_text: str, obj: Union[Sample, Record,
+                                                       Report]) -> Tag:
+    """Tag an object."""
+    if obj.id is None:
+        session.add(obj)
+        obj.tags.append(tag(session, tag_text))
+    else:
+        session.query(type(obj)).filter(
+            type(obj).id == obj.id).one().tags.append(tag(session, tag_text))
+    session.commit()
+
+
+def get_object_with_tags(session: Session,
+                         cls: Union[Type[Comment], Type[Sample], Type[Record],
+                                    Type[Report]], *tags: str) -> Query:
+    """
+    Query objects with the given tags.
+
+    Parameters
+    ----------
+    session : :class:`sqlalchemy.orm.Session`
+        The database session.
+    cls : :class:`sqlalchemy.orm.Mapper`
+        The object class.
+    tags : str
+        The tags.
+
+    Returns
+    -------
+    :class:`sqlalchemy.orm.Query`
+        The query.
+    """
+    if isinstance(session, Query):
+        q = session
+    else:
+        q = session.query(cls)
+    if not hasattr(cls, 'tags'):
+        return []
+
+    aliase = {tag: aliased(Tag) for tag in tags}
+
+    for tag, a in aliase.items():
+        q = q.join(a, cls.tags)
+        if '*' in tag:
+            q = q.filter(a.text.like(tag.replace('*', '%')))
+        else:
+            q = q.filter(a.text == tag)
+    return q
+
+
+def query_record(session: Session,
+                 offset: int = 0,
+                 limit: int = 10,
+                 app: str | None = None,
+                 tags: Sequence[str] = (),
+                 before: datetime | date | None = None,
+                 after: datetime | date | None = None):
+    tz_offset = datetime.now(timezone.utc).astimezone().utcoffset()
+    table = {'header': ['ID', 'App', 'tags', 'created time'], 'body': []}
+    apps = sorted(
+        set([
+            n for n, *_ in get_object_with_tags(session.query(Record.app),
+                                                Record, *tags).all()
+        ]))
+    apps = foldDict(dict([(app, None) for app in apps]))
+
+    query = get_object_with_tags(session, Record, *tags)
+
+    if app is not None:
+        if app.endswith('*'):
+            query = query.filter(Record.app.like(app[:-1] + '%'))
+        else:
+            query = query.filter(Record.app == app)
+    if before is not None:
+        if isinstance(before, date):
+            before = datetime(before.year, before.month, before.day)
+        query = query.filter(Record.ctime <= before - tz_offset)
+    if after is not None:
+        if isinstance(after, date):
+            after = datetime(after.year, after.month, after.day)
+        query = query.filter(Record.ctime >= after - tz_offset)
+    total = query.count()
+    for r in query.order_by(Record.ctime.desc()).limit(limit).offset(offset):
+        tags = sorted([t.text for t in r.tags])
+        ctime = r.ctime + tz_offset
+        row = [r.id, r.app, tags, ctime]
+        table['body'].append(row)
+
+    return total, apps, table
+
+
+def update_tags(session: Session,
+                record_id: int,
+                tags: Sequence[str],
+                append: bool = False):
+    record = session.get(Record, record_id)
+    if record is None:
+        return False
+    if append:
+        old = [t.text for t in record.tags]
+        for t in old:
+            if t not in tags:
+                tags.append(t)
+    record.tags = [tag(session, t) for t in tags]
+    try:
+        session.commit()
+    except Exception:
+        session.rollback()
+        return False
+    return True
+
+
+def remove_tags(session: Session, record_id: int, tags: Sequence[str]):
+    record = session.get(Record, record_id)
+    if record is None:
+        return False
+    old = [t.text for t in record.tags]
+    record.tags = [tag(session, t) for t in old if t not in tags]
+    try:
+        session.commit()
+    except Exception:
+        session.rollback()
+        return False
+    return True

{QuLab-2.0.1 → qulab-2.0.2}/qulab/scan/expression.py

@@ -323,6 +323,14 @@ class UnaryExpression(Expression):
         self.a = a
         self.op = op
 
+    def __getstate__(self) -> dict:
+        return {'a': self.a, 'op': self.op}
+
+    def __setstate__(self, state: dict):
+        self.a = state['a']
+        self.op = state['op']
+        self.cache = _empty
+
     def symbols(self) -> list[str]:
         if isinstance(self.a, Expression):
             return self.a.symbols()
@@ -362,6 +370,15 @@ class BinaryExpression(Expression):
         self.b = b
         self.op = op
 
+    def __getstate__(self) -> dict:
+        return {'a': self.a, 'b': self.b, 'op': self.op}
+
+    def __setstate__(self, state: dict):
+        self.a = state['a']
+        self.b = state['b']
+        self.op = state['op']
+        self.cache = _empty
+
     def symbols(self) -> list[str]:
         symbs = set()
         if isinstance(self.a, Expression):
@@ -419,6 +436,15 @@ class ObjectMethod(Expression):
         self.method = method
         self.args = args
 
+    def __getstate__(self) -> dict:
+        return {'obj': self.obj, 'method': self.method, 'args': self.args}
+
+    def __setstate__(self, state: dict):
+        self.obj = state['obj']
+        self.method = state['method']
+        self.args = state['args']
+        self.cache = _empty
+
     def symbols(self) -> list[str]:
         symbs = set()
         if isinstance(self.obj, Expression):
@@ -439,7 +465,7 @@ class ObjectMethod(Expression):
             return ObjectMethod(obj, self.method, *args)
         else:
             return getattr(obj, self.method)(*args)
-        
+
     def __repr__(self):
         if self.method == '__call__':
             return f"{self.obj!r}({', '.join(map(repr, self.args))})"
@@ -453,6 +479,13 @@ class Symbol(Expression):
         super().__init__()
         self.name = name
 
+    def __getstate__(self) -> dict:
+        return {'name': self.name}
+
+    def __setstate__(self, state: dict):
+        self.name = state['name']
+        self.cache = _empty
+
     def symbols(self) -> list[str]:
         return [self.name]