lima2.client 3.1.2__tar.gz → 4.0.0a0__tar.gz

{lima2_client-3.1.2/src/lima2_client.egg-info → lima2_client-4.0.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lima2-client
-Version: 3.1.2
+Version: 4.0.0a0
 Summary: Python client library for Lima2 detector
 Author: BCU (ESRF)
 License: Copyright (c) 2020-2024 Beamline Control Unit, ESRF
@@ -19,35 +19,38 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytango
-Requires-Dist: gevent
+Requires-Dist: h5py
 Requires-Dist: jsonschema
 Requires-Dist: jsonschema-default
-Requires-Dist: beartype
-Requires-Dist: numpy<2.3
+Requires-Dist: numpy
+Requires-Dist: pytango
 Requires-Dist: pyyaml
+Requires-Dist: requests
+Requires-Dist: starlette
 Requires-Dist: typing-extensions
-Requires-Dist: h5py
+Requires-Dist: typer
+Requires-Dist: uvicorn[standard]
 Provides-Extra: dev
 Requires-Dist: black==22.3; extra == "dev"
-Requires-Dist: mypy; extra == "dev"
-Requires-Dist: types-pyyaml; extra == "dev"
-Requires-Dist: types-jsonschema; extra == "dev"
-Requires-Dist: types-gevent; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
+Requires-Dist: httpx; extra == "dev"
 Requires-Dist: ipython; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
 Requires-Dist: nosqltangodb; extra == "dev"
-Requires-Dist: pytango-db; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-forked; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: requests-mock; extra == "dev"
+Requires-Dist: termcolor; extra == "dev"
+Requires-Dist: types-jsonschema; extra == "dev"
+Requires-Dist: types-pyyaml; extra == "dev"
+Requires-Dist: types-requests; extra == "dev"
 Provides-Extra: docs
+Requires-Dist: recommonmark; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinxcontrib-mermaid; extra == "docs"
 Requires-Dist: sphinxcontrib-napoleon; extra == "docs"
 Requires-Dist: sphinx-immaterial; extra == "docs"
-Requires-Dist: recommonmark; extra == "docs"
 Dynamic: license-file
 
 # LImA 2 Client library
@@ -61,9 +64,10 @@ Checkout the [documentation here](https://limagroup.gitlab-pages.esrf.fr/lima2-c
 In order to install lima2-client in a new conda environment:
 
 ```sh
-conda create -n l2c -c esrf-bcu python==3.10 pytango pytango-db
+conda create -n l2c -c esrf-bcu python==3.10
 pip install .[dev]
 ```
+
 The `dev` extra dependency adds linting, formatting, static analysis and testing tools.
 It also installs `ipython` required to run the `lima2_shell`.
 

{lima2_client-3.1.2 → lima2_client-4.0.0a0}/README.md

@@ -9,9 +9,10 @@ Checkout the [documentation here](https://limagroup.gitlab-pages.esrf.fr/lima2-c
 In order to install lima2-client in a new conda environment:
 
 ```sh
-conda create -n l2c -c esrf-bcu python==3.10 pytango pytango-db
+conda create -n l2c -c esrf-bcu python==3.10
 pip install .[dev]
 ```
+
 The `dev` extra dependency adds linting, formatting, static analysis and testing tools.
 It also installs `ipython` required to run the `lima2_shell`.
 

{lima2_client-3.1.2 → lima2_client-4.0.0a0}/pyproject.toml

@@ -19,15 +19,17 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 dependencies = [
-    "pytango",
-    "gevent",
+    "h5py",
     "jsonschema",
     "jsonschema-default",
-    "beartype",
-    "numpy<2.3",          # CI runner (CentOS 7) has glibc2.17, numpy>=2.3 needs glibc2.28+
+    "numpy",
+    "pytango",
     "pyyaml",
+    "requests",
+    "starlette",
     "typing-extensions",
-    "h5py",
+    "typer",
+    "uvicorn[standard]",
 ]
 
 [project.urls]
@@ -35,40 +37,68 @@ Repository = "https://gitlab.esrf.fr/limagroup/lima2-client"
 Documentation = "https://limagroup.gitlab-pages.esrf.fr/lima2-client/"
 
 [project.scripts]
-lima2_shell = "lima2.client.shell:main [dev]"
+lima2-conductor = "lima2.conductor.server.cli:cli"
+lima2-shell = "lima2.conductor.client.shell:app [dev]"
 
 [project.optional-dependencies]
 dev = [
     "black==22.3",
-    "mypy",
-    "types-pyyaml",
-    "types-jsonschema",
-    "types-gevent",
     "flake8",
+    "httpx",
     "ipython",
+    "mypy",
     "nosqltangodb",
-    "pytango-db",
     "pytest",
-    "pytest-forked",
     "pytest-asyncio",
     "pytest-cov",
+    "requests-mock",
+    "termcolor",
+    "types-jsonschema",
+    "types-pyyaml",
+    "types-requests",
 ]
 docs = [
+    "recommonmark",
     "sphinx",
     "sphinxcontrib-mermaid",
     "sphinxcontrib-napoleon",
     "sphinx-immaterial",
-    "recommonmark",
 ]
 
+[tool.mypy]
+packages = ["lima2.client", "lima2.conductor"]
+mypy_path = "src"
+allow_redefinition = true
+explicit_package_bases = true
+warn_return_any = true
+warn_unused_configs = true
+
+[[tool.mypy.overrides]]
+module = "tango.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "jsonschema_default.*"
+ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "h5py.*"
+ignore_missing_imports = true
+
+
 [tool.pytest.ini_options]
 addopts = "-v"
 testpaths = "tests"
-required_plugins = [
-    "pytest-cov>=6.0.0",
-    "pytest-forked>=1.6.0",
-    "pytest-asyncio>=0.25.3",
-]
+required_plugins = ["pytest-cov>=6.0.0", "pytest-asyncio>=0.25.3"]
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.coverage.run]
-omit = ["src/lima2/client/shell.py"]
+# Omit entrypoints in coverage report
+omit = [
+    "src/lima2/conductor/client/shell.py",
+    "src/lima2/conductor/server/cli.py",
+    "src/lima2/conductor/server/main.py",
+]
+
+[tool.coverage.report]
+exclude_also = ["raise NotImplementedError", "def __repr__"]

lima2_client-4.0.0a0/src/lima2/client/__init__.py

@@ -0,0 +1,14 @@
+# This file is part of the Lima2 project
+#
+# Copyright (c) 2020-2024 Beamline Control Unit, ESRF
+# Distributed under the MIT licence. See LICENSE for more info.
+
+"""Lima2 client package.
+
+Contains the stateful client for the lima2 acquisition system, with
+tango as the communication protocol.
+"""
+
+from lima2.client.acquisition_system import AcquisitionSystem
+
+__all__ = ["AcquisitionSystem"]