diff --git a/cfg/settings.example.toml b/cfg/settings.example.toml index da197b8..df32327 100644 --- a/cfg/settings.example.toml +++ b/cfg/settings.example.toml @@ -193,12 +193,12 @@ exchange_type = "direct" input_queue_size = 10 output_queue_size = 10 detector_model_device = "cuda:0" -detector_model_path = "/home/aurora/nn/cascade_maskrcnn_exps/epoch_12.pth" -detector_model_config_path = "/home/aurora/nn/cascade_maskrcnn_exps/config_predict.py" +detector_model_path = "/path/to/models/cascade_maskrcnn/epoch_12.pth" +detector_model_config_path = "/path/to/models/cascade_maskrcnn/config_predict.py" classifier_model_device = "cuda:0" -classifier_model_path = "/home/aurora/nn/efficientnet_v2_m_binary_classifier/model.pth" -classifier_label_mapper_path = "/home/aurora/nn/efficientnet_v2_m_binary_classifier/label_mapper.json" -classifier_transforms_path = "/home/aurora/nn/efficientnet_v2_m_binary_classifier/test_transforms.pth" +classifier_model_path = "/path/to/models/efficientnet_v2_m_binary_classifier/model.pth" +classifier_label_mapper_path = "/path/to/models/efficientnet_v2_m_binary_classifier/label_mapper.json" +classifier_transforms_path = "/path/to/models/efficientnet_v2_m_binary_classifier/test_transforms.pth" name = "Detector" [detection.detector.crop_setup] diff --git a/old/pascal/config.json b/old/pascal/config.json index 304c541..683da66 100644 --- a/old/pascal/config.json +++ b/old/pascal/config.json @@ -1,4 +1,4 @@ { "LogFolder" : "C:\\data\\log", - "RabbitmqHost" : "10.229.54.118" + "RabbitmqHost" : "localhost" } \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 8f13114..60023ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,6 +5,10 @@ description = "Autonomous PLD and RHEED equipment control" readme = "README.md" license = "MIT" license-files = ["LICENSE"] +authors = [ + { name = "Haotong Liang", email = "auroralht@gmail.com" }, + { name = "Haotong Liang", email = "hliang16@umd.edu" }, +] # Floor of 3.11: real code uses datetime.UTC and enum.StrEnum (both added in 3.11). # Capped below 3.12: mmdet hard-requires mmcv<2.2.0, but OpenMMLab only publishes # prebuilt mmcv<2.2.0 wheels up to cp311 -- see the `detection` extra below and diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 2ba8715..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -pypylon -opencv-python -av \ No newline at end of file diff --git a/scripts/start_instrument_host.ps1 b/scripts/start_instrument_host.ps1 index d45f202..820dea3 100644 --- a/scripts/start_instrument_host.ps1 +++ b/scripts/start_instrument_host.ps1 @@ -60,7 +60,7 @@ Run the preflight checks and exit without starting anything. .EXAMPLE - scripts\start_instrument_host.ps1 -BrokerHost 192.168.1.10 -User lumi-node -Password pw ` + scripts\start_instrument_host.ps1 -BrokerHost -User lumi-node -Password pw ` -Log 'D:\PASCAL\logs\growth.csv' -Mi 'D:\PASCAL\MI' #> diff --git a/setup.py b/setup.py deleted file mode 100644 index 4d3942a..0000000 --- a/setup.py +++ /dev/null @@ -1,160 +0,0 @@ -"""A setuptools based setup module. - -See: -https://packaging.python.org/guides/distributing-packages-using-setuptools/ -https://github.com/pypa/sampleproject -""" - -# Always prefer setuptools over distutils -from setuptools import setup, find_packages -import pathlib - -here = pathlib.Path(__file__).parent.resolve() - -# Get the long description from the README file -long_description = (here / "README.md").read_text(encoding="utf-8") - -# Arguments marked as "Required" below must be included for upload to PyPI. -# Fields marked as "Optional" may be commented out. - -setup( - # This is the name of your project. The first time you publish this - # package, this name will be registered for you. It will determine how - # users can install this project, e.g.: - # - # $ pip install sampleproject - # - # And where it will live on PyPI: https://pypi.org/project/sampleproject/ - # - # There are some restrictions on what makes a valid project name - # specification here: - # https://packaging.python.org/specifications/core-metadata/#name - name="lumi", # Required - # Versions should comply with PEP 440: - # https://www.python.org/dev/peps/pep-0440/ - # - # For a discussion on single-sourcing the version across setup.py and the - # project code, see - # https://packaging.python.org/guides/single-sourcing-package-version/ - version="0.0.1", # Required - # This is a one-line description or tagline of what your project does. This - # corresponds to the "Summary" metadata field: - # https://packaging.python.org/specifications/core-metadata/#summary - description="Autonomous PLD and RHEED project", # Optional - # This is an optional longer description of your project that represents - # the body of text which users will see when they visit PyPI. - # - # Often, this is the same as your README, so you can just read it in from - # that file directly (as we have already done above) - # - # This field corresponds to the "Description" metadata field: - # https://packaging.python.org/specifications/core-metadata/#description-optional - long_description=long_description, # Optional - # Denotes that our long_description is in Markdown; valid values are - # text/plain, text/x-rst, and text/markdown - # - # Optional if long_description is written in reStructuredText (rst) but - # required for plain-text or Markdown; if unspecified, "applications should - # attempt to render [the long_description] as text/x-rst; charset=UTF-8 and - # fall back to text/plain if it is not valid rst" (see link below) - # - # This field corresponds to the "Description-Content-Type" metadata field: - # https://packaging.python.org/specifications/core-metadata/#description-content-type-optional - long_description_content_type="text/markdown", # Optional (see note above) - # This should be a valid link to your project's main homepage. - # - # This field corresponds to the "Home-Page" metadata field: - # https://packaging.python.org/specifications/core-metadata/#home-page-optional - url="", # Optional - # This should be your name or the name of the organization which owns the - # project. - author="Haotong Liang", # Optional - # This should be a valid email address corresponding to the author listed - # above. - author_email="hliang16@umd.edu", # Optional - # Classifiers help users find your project by categorizing it. - # - # For a list of valid classifiers, see https://pypi.org/classifiers/ - classifiers=[ # Optional - # How mature is this project? Common values are - # 3 - Alpha - # 4 - Beta - # 5 - Production/Stable - "Development Status :: 3 - Alpha", - # Indicate who your project is intended for - "Intended Audience :: Developers", - "Topic :: Software Development :: Build Tools", - # Pick your license as you wish - "License :: OSI Approved :: MIT License", - # Specify the Python versions you support here. In particular, ensure - # that you indicate you support Python 3. These classifiers are *not* - # checked by 'pip install'. See instead 'python_requires' below. - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3 :: Only", - ], - # This field adds keywords for your project which will appear on the - # project page. What does your project relate to? - # - # Note that this is a list of additional keywords, separated - # by commas, to be used to assist searching for the distribution in a - # larger catalog. - keywords="Neural Network, AI, PLD, RHEED", # Optional - # When your source code is in a subdirectory under the project root, e.g. - # `src/`, it is necessary to specify the `package_dir` argument. - package_dir={"": "src"}, # Optional - # You can just specify package directories manually here if your project is - # simple. Or you can use find_packages(). - # - # Alternatively, if you just want to distribute a single Python file, use - # the `py_modules` argument instead as follows, which will expect a file - # called `my_module.py` to exist: - # - # py_modules=["my_module"], - # - packages=find_packages(where="src"), # Required - # Specify which Python versions you support. In contrast to the - # 'Programming Language' classifiers above, 'pip install' will check this - # and refuse to install the project if the version does not match. See - # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires - python_requires=">=3.7, <4", - # This field lists other packages that your project depends on to run. - # Any package you put here will be installed by pip when your project is - # installed, so they must be valid existing projects. - # - # For an analysis of "install_requires" vs pip's requirements files see: - # https://packaging.python.org/discussions/install-requires-vs-requirements/ - install_requires=[], # Optional - # List additional groups of dependencies here (e.g. development - # dependencies). Users will be able to install these using the "extras" - # syntax, for example: - # - # $ pip install sampleproject[dev] - # - # Similar to `install_requires` above, these must be valid existing - # projects. - extras_require={ # Optional - "dev": ["check-manifest"], - "test": ["coverage"], - }, - # If there are data files included in your packages that need to be - # installed, specify them here. - package_data={ # Optional - }, - # Entry points. The following would provide a command called `sample` which - # executes the function `main` from this package when invoked: - entry_points={}, - # List additional URLs that are relevant to your project as a dict. - # - # This field corresponds to the "Project-URL" metadata fields: - # https://packaging.python.org/specifications/core-metadata/#project-url-multiple-use - # - # Examples listed include a pattern for specifying where the package tracks - # issues, where the source is hosted, where to say thanks to the package - # maintainers, and where to support the project financially. The key is - # what's used to render the link text on PyPI. - project_urls={}, -) \ No newline at end of file diff --git a/src/README.md b/src/README.md deleted file mode 100644 index 308e754..0000000 --- a/src/README.md +++ /dev/null @@ -1,5 +0,0 @@ -To start message queue on windows - -```Powershell -$job = Start-Job { docker run --rm --name rabbitmq -p 5672:5672 -p 15672:15672 rabbitmq:3.13-management } -``` \ No newline at end of file diff --git a/src/__init__.py b/src/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/local_requirements.txt b/src/local_requirements.txt deleted file mode 100644 index 2c63b8d..0000000 --- a/src/local_requirements.txt +++ /dev/null @@ -1 +0,0 @@ -rhana diff --git a/src/lumi/api/index.html b/src/lumi/api/index.html index 127cecf..29140f4 100644 --- a/src/lumi/api/index.html +++ b/src/lumi/api/index.html @@ -1,638 +1,41 @@ - - + - WebSocket MP4 Stream - + + + lumi API - - - - - -
-
-
-
-
-
- - - - -
-
-
- - - - - - - - -
-
- -

- - -

- - -

- - -

- - -
- - -
- -
-

Server-Sent Events Display

- -
- - - -
- - 

-
-    
+    
lumi API

+    

+      This service authenticates users and bridges a browser to the message bus
+      over a single /ws websocket. It serves no application UI —
+      the browser client lives in a separate frontend repository.
+    

+    
+    

+      See the project README.md and docs/ for architecture,
+      auth, and the contract-driven bridge.
+    

   
 
diff --git a/src/requirements.txt b/src/requirements.txt
deleted file mode 100644
index d4e1dea..0000000
--- a/src/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-fastapi
-requests
-av
-opencv-python
-aiosqlite
-pypylon
\ No newline at end of file
diff --git a/tests/speed/test_combine.py b/tests/speed/test_combine.py
index 12d6392..f15df4f 100644
--- a/tests/speed/test_combine.py
+++ b/tests/speed/test_combine.py
@@ -3,7 +3,7 @@
 import json
 
 n_trials = 1000
-host = "10.229.54.118:8000"
+host = "localhost:8000"
 
 for i in tqdm.tqdm( range(n_trials), total = n_trials):
     r = requests.get(f'http://{host}/chamber/log')
diff --git a/tests/speed/test_frame.py b/tests/speed/test_frame.py
index ab065ad..3c0f0a6 100644
--- a/tests/speed/test_frame.py
+++ b/tests/speed/test_frame.py
@@ -3,7 +3,7 @@
 import json
 
 n_trials = 1000
-host = "10.229.54.118:8000"
+host = "localhost:8000"
 
 for i in tqdm.tqdm( range(n_trials), total = n_trials):
     r = requests.get(f'http://{host}/RHEED/image')
diff --git a/tests/speed/test_log.py b/tests/speed/test_log.py
index 1f64e77..d0e328b 100644
--- a/tests/speed/test_log.py
+++ b/tests/speed/test_log.py
@@ -3,7 +3,7 @@
 import json
 
 n_trials = 1000
-host = "10.229.54.118:8000"
+host = "localhost:8000"
 
 for i in tqdm.tqdm( range(n_trials), total = n_trials):
     r = requests.get(f'http://{host}/chamber/log')