renaming pyDataInterface -> pyDataService

This commit is contained in:
Mose Müller 2023-08-02 12:06:22 +02:00
parent e7a0017431
commit 7861def541
37 changed files with 28 additions and 28 deletions

View File

@ -1,11 +1,11 @@
{ {
"name": "pydatainterface", "name": "pyDataService",
"version": "0.1.0", "version": "0.1.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pydatainterface", "name": "pyDataService",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",

View File

@ -1,5 +1,5 @@
{ {
"name": "pydatainterface", "name": "pydataservice",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
@ -20,7 +20,7 @@
}, },
"scripts": { "scripts": {
"start": "NODE_ENV=development react-scripts start", "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", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },

View File

@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta
name="description" 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" /> <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. 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`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>pyDataInterface App</title> <title>pyDataService App</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>

View File

@ -1,10 +1,10 @@
[tool.poetry] [tool.poetry]
name = "pyDataInterface" name = "pyDataService"
version = "0.1.0" version = "0.1.0"
description = "" description = ""
authors = ["Mose Mueller <mosmuell@ethz.ch>"] authors = ["Mose Mueller <mosmuell@ethz.ch>"]
readme = "README.md" readme = "README.md"
packages = [{ include = "pyDataInterface", from = "src" }] packages = [{ include = "pyDataService", from = "src" }]
[tool.poetry.dependencies] [tool.poetry.dependencies]
@ -39,7 +39,7 @@ requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"
[tool.pyright] [tool.pyright]
include = ["src/pyDataInterface", "tests"] include = ["src/pyDataService", "tests"]
exclude = ["**/node_modules", "**/__pycache__", "docs", "frontend"] exclude = ["**/node_modules", "**/__pycache__", "docs", "frontend"]
venvPath = "." venvPath = "."
venv = ".venv" venv = ".venv"

View File

@ -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>

View File

@ -5,7 +5,7 @@ from abc import ABC, abstractmethod
from collections.abc import Callable from collections.abc import Callable
from typing import Any, TypedDict 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): class AbstractDataService(ABC):

View File

@ -4,7 +4,7 @@ from typing import Any, cast
from loguru import logger 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 .abstract_service_classes import AbstractCallbackManager, AbstractDataService
from .data_service_list import DataServiceList from .data_service_list import DataServiceList

View File

@ -8,7 +8,7 @@ from typing import Any, Optional, cast, get_type_hints
import rpyc import rpyc
from loguru import logger from loguru import logger
from pyDataInterface.utils.helpers import ( from pyDataService.utils.helpers import (
convert_arguments_to_hinted_types, convert_arguments_to_hinted_types,
generate_paths_from_DataService_dict, generate_paths_from_DataService_dict,
get_class_and_instance_attributes, get_class_and_instance_attributes,
@ -17,7 +17,7 @@ from pyDataInterface.utils.helpers import (
parse_list_attr_and_index, parse_list_attr_and_index,
update_value_if_changed, update_value_if_changed,
) )
from pyDataInterface.utils.warnings import ( from pyDataService.utils.warnings import (
warn_if_instance_class_does_not_inherit_from_DataService, warn_if_instance_class_does_not_inherit_from_DataService,
) )

View File

@ -1,7 +1,7 @@
from collections.abc import Callable from collections.abc import Callable
from typing import Any from typing import Any
from pyDataInterface.utils.warnings import ( from pyDataService.utils.warnings import (
warn_if_instance_class_does_not_inherit_from_DataService, warn_if_instance_class_does_not_inherit_from_DataService,
) )

View File

@ -54,7 +54,7 @@ class TaskManager(AbstractTaskManager):
In the above example, `my_task` will start running as soon as 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 `_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: The responsibilities of the TaskManager class are:

View 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>

View File

@ -15,8 +15,8 @@ from rpyc import (
from rpyc import ThreadedServer from rpyc import ThreadedServer
from uvicorn.server import HANDLED_SIGNALS from uvicorn.server import HANDLED_SIGNALS
from pyDataInterface import DataService from pyDataService import DataService
from pyDataInterface.version import __version__ from pyDataService.version import __version__
from .web_server import WebAPI from .web_server import WebAPI
@ -117,7 +117,7 @@ class Server:
self.servers["rpyc"] = future_or_task self.servers["rpyc"] = future_or_task
if self._enable_tiqi_rpc and tiqi_rpc is not None: if self._enable_tiqi_rpc and tiqi_rpc is not None:
tiqi_rpc_server = tiqi_rpc.Server( 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, host=self._host,
port=self._rpc_port, port=self._rpc_port,
) )

View File

@ -7,9 +7,9 @@ from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from loguru import logger from loguru import logger
from pyDataInterface import DataService from pyDataService import DataService
from pyDataInterface.config import OperationMode from pyDataService.config import OperationMode
from pyDataInterface.version import __version__ from pyDataService.version import __version__
class UpdateDict(TypedDict): class UpdateDict(TypedDict):

View File

@ -5,8 +5,8 @@ import pytest
from loguru import logger from loguru import logger
from pytest import LogCaptureFixture from pytest import LogCaptureFixture
from pyDataInterface import DataService from pyDataService import DataService
from pyDataInterface.data_service.callback_manager import CallbackManager from pyDataService.data_service.callback_manager import CallbackManager
@pytest.fixture @pytest.fixture

View File

@ -1,6 +1,6 @@
from pytest import CaptureFixture from pytest import CaptureFixture
from pyDataInterface import DataService from pyDataService import DataService
def test_class_list_attribute(capsys: CaptureFixture) -> None: def test_class_list_attribute(capsys: CaptureFixture) -> None:

View File

@ -1,6 +1,6 @@
from pytest import CaptureFixture from pytest import CaptureFixture
from pyDataInterface import DataService from pyDataService import DataService
def test_class_attributes(capsys: CaptureFixture) -> None: def test_class_attributes(capsys: CaptureFixture) -> None:

View File

@ -1,6 +1,6 @@
from pytest import CaptureFixture from pytest import CaptureFixture
from pyDataInterface import DataService from pyDataService import DataService
def test_properties(capsys: CaptureFixture) -> None: def test_properties(capsys: CaptureFixture) -> None:

View File

@ -1,6 +1,6 @@
from pytest import LogCaptureFixture from pytest import LogCaptureFixture
from pyDataInterface import DataService from pyDataService import DataService
from . import caplog # noqa from . import caplog # noqa