format related files and create new modules (for including contents from sqdl-ct-sync)

core_tools/data/sqdl/__init__.py

@@ -7,4 +7,4 @@ from .sqdl_reader import (
     sqdl_query,
     download_hdf5,
     download_hdf5_parallel,
-    )
+)

core_tools/data/sqdl/sqdl_reader.py

@@ -94,16 +94,17 @@ class DatasetReader:
                 shutil.copyfileobj(fsrc, fdst)
 
     def query_datasets(
-            self,
-            name_contains: str = None,
-            start_time: datetime = None,
-            end_time: datetime = None,
-            setup: str = None,
-            sample: str = None,
-            starred: bool = False,
-            variables: list[str] | str | None = None,
-            axes: list[str] | str | None = None,
-            ) -> list[DatasetInfo]:
+        self,
+        name_contains: str = None,
+        start_time: datetime = None,
+        end_time: datetime = None,
+        setup: str = None,
+        sample: str = None,
+        starred: bool = False,
+        variables: list[str] | str | None = None,
+        axes: list[str] | str | None = None,
+    ) -> list[DatasetInfo]:
+
         data_identifiers = {}
         if sample is not None:
             data_identifiers['sample'] = sample
@@ -115,13 +116,13 @@ class DatasetReader:
             data_identifiers['dimensions'] = axes
 
         sqdl_res = self.scope.search_datasets(
-            dataset_name_contains = name_contains,
-            collected_since = start_time,
-            collected_until = end_time,
-            rating = 1 if starred else None,
-            data_identifiers = data_identifiers,
+            dataset_name_contains=name_contains,
+            collected_since=start_time,
+            collected_until=end_time,
+            rating=1 if starred else None,
+            data_identifiers=data_identifiers,
             limit=1000,
-            )
+        )
 
         res = []
         for r in sqdl_res:
@@ -135,8 +136,8 @@ class DatasetReader:
                     r.rating > 0,
                     r.metadata['variables_measured'],
                     r.metadata['dimensions'],
-                    )
                 )
+            )
 
         return res
 
@@ -165,33 +166,30 @@ def sqdl_logout():
 
 
 def sqdl_query(
-            name_contains: str = None,
-            start_time: datetime = None,
-            end_time: datetime = None,
-            setup: str = None,
-            sample: str = None,
-            starred: bool = False,
-            variables: list[str] | str | None = None,
-            axes: list[str] | str | None = None,
-            ) -> list[DatasetInfo]:
+    name_contains: str = None,
+    start_time: datetime = None,
+    end_time: datetime = None,
+    setup: str = None,
+    sample: str = None,
+    starred: bool = False,
+    variables: list[str] | str | None = None,
+    axes: list[str] | str | None = None,
+) -> list[DatasetInfo]:
 
     return _get_dataset_reader().query_datasets(
-            name_contains=name_contains,
-            start_time=start_time,
-            end_time=end_time,
-            setup=setup,
-            sample=sample,
-            starred=starred,
-            variables=variables,
-            axes=axes,
-        )
+        name_contains=name_contains,
+        start_time=start_time,
+        end_time=end_time,
+        setup=setup,
+        sample=sample,
+        starred=starred,
+        variables=variables,
+        axes=axes,
+    )
 
 
 def list_scopes():
-    global _DATASET_READER
-    if _DATASET_READER is None:
-        _DATASET_READER = DatasetReader()
-    return _DATASET_READER.list_scopes()
+    return _get_dataset_reader().list_scopes()
 
 
 def load_by_uuid(uuid: str | int):
@@ -226,5 +224,6 @@ def download_hdf5_parallel(
         return list(
             executor.map(
                 partial(reader.download_hdf5_by_uid, download_dir=download_dir),
-                iterator)
+                iterator
             )
+        )

setup.py

 from setuptools import setup, find_packages
 
-setup(name="core_tools",
+setup(
+    name="core_tools",
     version="1.5.11",
-    packages = find_packages(),
+    packages=find_packages(),
     python_requires=">=3.10",
     install_requires=[
-          'pyqt5 >= 5.15.1',
-          'pyqtgraph >= 0.13',
-          'matplotlib',
-          'psycopg2; platform_system != "Darwin"',
-          'psycopg2-binary; platform_system == "Darwin"',
-          'xarray',
-          'h5netcdf',
-          'qcodes',
-          'numpy >= 1.24',
-          'ruamel-yaml',
-          # 'pulse_lib',
-          'qdarkstyle',
-      ],
+        'pyqt5 >= 5.15.1',
+        'pyqtgraph >= 0.13',
+        'matplotlib',
+        'psycopg2; platform_system != "Darwin"',
+        'psycopg2-binary; platform_system == "Darwin"',
+        'xarray',
+        'h5netcdf',
+        'qcodes',
+        'numpy >= 1.24',
+        'ruamel-yaml',
+        # 'pulse_lib',
+        'qdarkstyle',
+    ],
     package_data={
         "core_tools": ["py.typed"],
         "": ["*.qml", "*.png"],
     },
-    )
+)