mirror of
https://github.com/tiqi-group/pydase.git
synced 2025-04-24 10:00:03 +02:00
renaming pyDataInterface -> pyDataService
This commit is contained in:
Mose Müller
parent
e7a0017431
commit
7861def541
4
frontend/package-lock.json
generated
4
frontend/package-lock.json
generated
@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "pydatainterface",
|
||||
"name": "pyDataService",
|
||||
"version": "0.1.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "pydatainterface",
|
||||
"name": "pyDataService",
|
||||
"version": "0.1.0",
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.11.1",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "pydatainterface",
|
||||
"name": "pydataservice",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
@ -20,7 +20,7 @@
|
||||
},
|
||||
"scripts": {
|
||||
"start": "NODE_ENV=development react-scripts start",
|
||||
"build": "BUILD_PATH='../src/pyDataInterface/frontend' react-scripts build",
|
||||
"build": "BUILD_PATH='../src/pyDataService/frontend' react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta
|
||||
name="description"
|
||||
content="Web site displaying a pyDataInterface UI."
|
||||
content="Web site displaying a pyDataService UI."
|
||||
/>
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||
<!--
|
||||
@ -24,7 +24,7 @@
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>pyDataInterface App</title>
|
||||
<title>pyDataService App</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
[tool.poetry]
|
||||
name = "pyDataInterface"
|
||||
name = "pyDataService"
|
||||
version = "0.1.0"
|
||||
description = ""
|
||||
authors = ["Mose Mueller <mosmuell@ethz.ch>"]
|
||||
readme = "README.md"
|
||||
packages = [{ include = "pyDataInterface", from = "src" }]
|
||||
packages = [{ include = "pyDataService", from = "src" }]
|
||||
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
@ -39,7 +39,7 @@ requires = ["poetry-core"]
|
||||
build-backend = "poetry.core.masonry.api"
|
||||
|
||||
[tool.pyright]
|
||||
include = ["src/pyDataInterface", "tests"]
|
||||
include = ["src/pyDataService", "tests"]
|
||||
exclude = ["**/node_modules", "**/__pycache__", "docs", "frontend"]
|
||||
venvPath = "."
|
||||
venv = ".venv"
|
||||
|
||||
@ -1 +0,0 @@
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site displaying a pyDataInterface UI."/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>pyDataInterface App</title><script defer="defer" src="/static/js/main.188dd6ca.js"></script><link href="/static/css/main.4da62354.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
||||
@ -5,7 +5,7 @@ from abc import ABC, abstractmethod
|
||||
from collections.abc import Callable
|
||||
from typing import Any, TypedDict
|
||||
|
||||
from pyDataInterface.data_service.data_service_list import DataServiceList
|
||||
from pyDataService.data_service.data_service_list import DataServiceList
|
||||
|
||||
|
||||
class AbstractDataService(ABC):
|
||||
@ -4,7 +4,7 @@ from typing import Any, cast
|
||||
|
||||
from loguru import logger
|
||||
|
||||
from pyDataInterface.utils.helpers import get_class_and_instance_attributes
|
||||
from pyDataService.utils.helpers import get_class_and_instance_attributes
|
||||
|
||||
from .abstract_service_classes import AbstractCallbackManager, AbstractDataService
|
||||
from .data_service_list import DataServiceList
|
||||
@ -8,7 +8,7 @@ from typing import Any, Optional, cast, get_type_hints
|
||||
import rpyc
|
||||
from loguru import logger
|
||||
|
||||
from pyDataInterface.utils.helpers import (
|
||||
from pyDataService.utils.helpers import (
|
||||
convert_arguments_to_hinted_types,
|
||||
generate_paths_from_DataService_dict,
|
||||
get_class_and_instance_attributes,
|
||||
@ -17,7 +17,7 @@ from pyDataInterface.utils.helpers import (
|
||||
parse_list_attr_and_index,
|
||||
update_value_if_changed,
|
||||
)
|
||||
from pyDataInterface.utils.warnings import (
|
||||
from pyDataService.utils.warnings import (
|
||||
warn_if_instance_class_does_not_inherit_from_DataService,
|
||||
)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
from collections.abc import Callable
|
||||
from typing import Any
|
||||
|
||||
from pyDataInterface.utils.warnings import (
|
||||
from pyDataService.utils.warnings import (
|
||||
warn_if_instance_class_does_not_inherit_from_DataService,
|
||||
)
|
||||
|
||||
@ -54,7 +54,7 @@ class TaskManager(AbstractTaskManager):
|
||||
|
||||
In the above example, `my_task` will start running as soon as
|
||||
`_start_autostart_tasks` is called which is done when the DataService instance is
|
||||
passed to the `pyDataInterface.Server` class.
|
||||
passed to the `pyDataService.Server` class.
|
||||
|
||||
The responsibilities of the TaskManager class are:
|
||||
|
||||
1
src/pyDataService/frontend/index.html
Normal file
1
src/pyDataService/frontend/index.html
Normal file
@ -0,0 +1 @@
|
||||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site displaying a pyDataService UI."/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>pyDataService App</title><script defer="defer" src="/static/js/main.188dd6ca.js"></script><link href="/static/css/main.4da62354.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
||||
@ -15,8 +15,8 @@ from rpyc import (
|
||||
from rpyc import ThreadedServer
|
||||
from uvicorn.server import HANDLED_SIGNALS
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataInterface.version import __version__
|
||||
from pyDataService import DataService
|
||||
from pyDataService.version import __version__
|
||||
|
||||
from .web_server import WebAPI
|
||||
|
||||
@ -117,7 +117,7 @@ class Server:
|
||||
self.servers["rpyc"] = future_or_task
|
||||
if self._enable_tiqi_rpc and tiqi_rpc is not None:
|
||||
tiqi_rpc_server = tiqi_rpc.Server(
|
||||
RPCInterface(self._data_model, info=self._info, **self._kwargs),
|
||||
RPCInterface(self._service, info=self._info, **self._kwargs),
|
||||
host=self._host,
|
||||
port=self._rpc_port,
|
||||
)
|
||||
@ -7,9 +7,9 @@ from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from loguru import logger
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataInterface.config import OperationMode
|
||||
from pyDataInterface.version import __version__
|
||||
from pyDataService import DataService
|
||||
from pyDataService.config import OperationMode
|
||||
from pyDataService.version import __version__
|
||||
|
||||
|
||||
class UpdateDict(TypedDict):
|
||||
@ -5,8 +5,8 @@ import pytest
|
||||
from loguru import logger
|
||||
from pytest import LogCaptureFixture
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataInterface.data_service.callback_manager import CallbackManager
|
||||
from pyDataService import DataService
|
||||
from pyDataService.data_service.callback_manager import CallbackManager
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
from pytest import CaptureFixture
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataService import DataService
|
||||
|
||||
|
||||
def test_class_list_attribute(capsys: CaptureFixture) -> None:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
from pytest import CaptureFixture
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataService import DataService
|
||||
|
||||
|
||||
def test_class_attributes(capsys: CaptureFixture) -> None:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
from pytest import CaptureFixture
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataService import DataService
|
||||
|
||||
|
||||
def test_properties(capsys: CaptureFixture) -> None:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
from pytest import LogCaptureFixture
|
||||
|
||||
from pyDataInterface import DataService
|
||||
from pyDataService import DataService
|
||||
|
||||
from . import caplog # noqa
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user