mirror of
https://github.com/tiqi-group/pydase.git
synced 2025-06-07 05:50:41 +02:00
removes unused "info" endpoint from web server
This commit is contained in:
parent
d5cd97ea57
commit
c60730f21b
@ -16,7 +16,6 @@ from uvicorn.server import HANDLED_SIGNALS
|
|||||||
from pydase import DataService
|
from pydase import DataService
|
||||||
from pydase.data_service.state_manager import StateManager
|
from pydase.data_service.state_manager import StateManager
|
||||||
from pydase.utils.serializer import dump, get_nested_dict_by_path
|
from pydase.utils.serializer import dump, get_nested_dict_by_path
|
||||||
from pydase.version import __version__
|
|
||||||
|
|
||||||
from .web_server import WebAPI
|
from .web_server import WebAPI
|
||||||
|
|
||||||
@ -192,17 +191,6 @@ class Server:
|
|||||||
self.should_exit = False
|
self.should_exit = False
|
||||||
self.servers: dict[str, asyncio.Future[Any]] = {}
|
self.servers: dict[str, asyncio.Future[Any]] = {}
|
||||||
self.executor: ThreadPoolExecutor | None = None
|
self.executor: ThreadPoolExecutor | None = None
|
||||||
self._info: dict[str, Any] = {
|
|
||||||
"name": self._service.get_service_name(),
|
|
||||||
"version": __version__,
|
|
||||||
"rpc_port": self._rpc_port,
|
|
||||||
"web_port": self._web_port,
|
|
||||||
"enable_rpc": self._enable_rpc,
|
|
||||||
"enable_web": self._enable_web,
|
|
||||||
"web_settings": self._web_settings,
|
|
||||||
"additional_servers": [],
|
|
||||||
**kwargs,
|
|
||||||
}
|
|
||||||
self._state_manager = StateManager(self._service, filename)
|
self._state_manager = StateManager(self._service, filename)
|
||||||
if getattr(self._service, "_filename", None) is not None:
|
if getattr(self._service, "_filename", None) is not None:
|
||||||
self._service._state_manager = self._state_manager
|
self._service._state_manager = self._state_manager
|
||||||
@ -270,28 +258,18 @@ class Server:
|
|||||||
port=server["port"],
|
port=server["port"],
|
||||||
host=self._host,
|
host=self._host,
|
||||||
state_manager=self._state_manager,
|
state_manager=self._state_manager,
|
||||||
info=self._info,
|
|
||||||
**server["kwargs"],
|
**server["kwargs"],
|
||||||
)
|
)
|
||||||
|
|
||||||
server_name = (
|
server_name = (
|
||||||
addin_server.__module__ + "." + addin_server.__class__.__name__
|
addin_server.__module__ + "." + addin_server.__class__.__name__
|
||||||
)
|
)
|
||||||
self._info["additional_servers"].append(
|
|
||||||
{
|
|
||||||
"name": server_name,
|
|
||||||
"port": server["port"],
|
|
||||||
"host": self._host,
|
|
||||||
**server["kwargs"],
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
future_or_task = self._loop.create_task(addin_server.serve())
|
future_or_task = self._loop.create_task(addin_server.serve())
|
||||||
self.servers[server_name] = future_or_task
|
self.servers[server_name] = future_or_task
|
||||||
if self._enable_web:
|
if self._enable_web:
|
||||||
self._wapi: WebAPI = WebAPI(
|
self._wapi: WebAPI = WebAPI(
|
||||||
service=self._service,
|
service=self._service,
|
||||||
info=self._info,
|
|
||||||
state_manager=self._state_manager,
|
state_manager=self._state_manager,
|
||||||
**self._kwargs,
|
**self._kwargs,
|
||||||
)
|
)
|
||||||
|
@ -77,7 +77,6 @@ class WebAPI:
|
|||||||
frontend: str | Path | None = None,
|
frontend: str | Path | None = None,
|
||||||
css: str | Path | None = None,
|
css: str | Path | None = None,
|
||||||
enable_CORS: bool = True,
|
enable_CORS: bool = True,
|
||||||
info: dict[str, Any] = {},
|
|
||||||
*args: Any,
|
*args: Any,
|
||||||
**kwargs: Any,
|
**kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
@ -86,7 +85,6 @@ class WebAPI:
|
|||||||
self.frontend = frontend
|
self.frontend = frontend
|
||||||
self.css = css
|
self.css = css
|
||||||
self.enable_CORS = enable_CORS
|
self.enable_CORS = enable_CORS
|
||||||
self.info = info
|
|
||||||
self.args = args
|
self.args = args
|
||||||
self.kwargs = kwargs
|
self.kwargs = kwargs
|
||||||
|
|
||||||
@ -126,7 +124,7 @@ class WebAPI:
|
|||||||
self.__sio = sio
|
self.__sio = sio
|
||||||
self.__sio_app = socketio.ASGIApp(self.__sio)
|
self.__sio_app = socketio.ASGIApp(self.__sio)
|
||||||
|
|
||||||
def setup_fastapi_app(self) -> None: # noqa: C901
|
def setup_fastapi_app(self) -> None:
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
|
|
||||||
if self.enable_CORS:
|
if self.enable_CORS:
|
||||||
@ -147,10 +145,6 @@ class WebAPI:
|
|||||||
def name() -> str:
|
def name() -> str:
|
||||||
return self.service.get_service_name()
|
return self.service.get_service_name()
|
||||||
|
|
||||||
@app.get("/info")
|
|
||||||
def info() -> dict[str, Any]:
|
|
||||||
return self.info
|
|
||||||
|
|
||||||
@app.get("/service-properties")
|
@app.get("/service-properties")
|
||||||
def service_properties() -> dict[str, Any]:
|
def service_properties() -> dict[str, Any]:
|
||||||
return self.state_manager.cache
|
return self.state_manager.cache
|
||||||
|
Loading…
x
Reference in New Issue
Block a user