Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️Webserver: refactor computations plugin (⚠️ devops) #4162

Merged
merged 12 commits into from
Apr 25, 2023
Merged

♻️Webserver: refactor computations plugin (⚠️ devops) #4162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
66578d3
renamed computation to notifications
sanderegg Apr 25, 2023
0d2e8eb
reduce complexity
sanderegg Apr 25, 2023
618b8fd
remove fixme
sanderegg Apr 25, 2023
6e5da21
fix imports
sanderegg Apr 25, 2023
daed72c
fix test and structure of db payload
sanderegg Apr 25, 2023
127ff0c
@pcrespov review: rename
sanderegg Apr 25, 2023
2c36dbe
@pcrespov review: rename
sanderegg Apr 25, 2023
8ec150c
@pcrespov review: rename
sanderegg Apr 25, 2023
b995ab0
@pcrespov review: handle undefined case before doing excessive calls
sanderegg Apr 25, 2023
79dfed9
fix imports
sanderegg Apr 25, 2023
6300a35
mypy
sanderegg Apr 25, 2023
1ade3ac
mypy
sanderegg Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env-wb-garbage-collector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

WEBSERVER_ACTIVITY=null
WEBSERVER_CATALOG=null
WEBSERVER_COMPUTATION=0
WEBSERVER_NOTIFICATIONS=0
WEBSERVER_DIAGNOSTICS=null
#WEBSERVER_DIRECTOR_V2 from .env
WEBSERVER_DIRECTOR=null
Expand Down
4 changes: 2 additions & 2 deletions services/web/server/src/simcore_service_webserver/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from .application_settings import setup_settings
from .catalog import setup_catalog
from .clusters.plugin import setup_clusters
from .computation import setup_computation
from .db import setup_db
from .diagnostics import setup_diagnostics
from .director.plugin import setup_director
Expand All @@ -26,6 +25,7 @@
from .login.plugin import setup_login
from .long_running_tasks import setup_long_running_tasks
from .meta_modeling.plugin import setup_meta_modeling
from .notifications.plugin import setup_notifications
from .products.plugin import setup_products
from .projects.plugin import setup_projects
from .publications import setup_publications
Expand Down Expand Up @@ -79,7 +79,7 @@ def create_application() -> web.Application:
# monitoring
setup_diagnostics(app)
setup_activity(app)
setup_computation(app)
setup_notifications(app)
setup_socketio(app)

# login
Expand Down
4 changes: 3 additions & 1 deletion services/web/server/src/simcore_service_webserver/application_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):

# These plugins only require (for the moment) an entry to toggle between enabled/disabled
WEBSERVER_CLUSTERS: bool = False
WEBSERVER_COMPUTATION: bool = True
WEBSERVER_NOTIFICATIONS: bool = Field(
default=True, env=["WEBSERVER_NOTIFICATIONS", "WEBSERVER_COMPUTATION"]
)
WEBSERVER_GROUPS: bool = True
WEBSERVER_META_MODELING: bool = True
WEBSERVER_PRODUCTS: bool = True
Expand Down
5 changes: 2 additions & 3 deletions services/web/server/src/simcore_service_webserver/application_settings_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> dict[str, Any]:
),
},
"clusters": {"enabled": app_settings.WEBSERVER_CLUSTERS},
"computation": {"enabled": app_settings.is_enabled("WEBSERVER_COMPUTATION")},
"computation": {"enabled": app_settings.is_enabled("WEBSERVER_NOTIFICATIONS")},
"diagnostics": {"enabled": app_settings.is_enabled("WEBSERVER_DIAGNOSTICS")},
"director-v2": {"enabled": app_settings.is_enabled("WEBSERVER_DIRECTOR_V2")},
"exporter": {"enabled": app_settings.WEBSERVER_EXPORTER is not None},
Expand Down Expand Up @@ -206,7 +206,6 @@ def _set_if_disabled(field_name, section):

if db := cfg.get("db"):
if section := db.get("postgres"):

envs["POSTGRES_DB"] = section.get("database")
envs["POSTGRES_HOST"] = section.get("host")
envs["POSTGRES_MAXSIZE"] = section.get("maxsize")
Expand Down Expand Up @@ -275,7 +274,7 @@ def _set_if_disabled(field_name, section):
envs["PROMETHEUS_VTAG"] = section.get("prometheus_api_version")

if section := cfg.get("computation"):
_set_if_disabled("WEBSERVER_COMPUTATION", section)
_set_if_disabled("WEBSERVER_NOTIFICATIONS", section)

if section := cfg.get("diagnostics"):
_set_if_disabled("WEBSERVER_DIAGNOSTICS", section)
Expand Down
183 changes: 0 additions & 183 deletions services/web/server/src/simcore_service_webserver/computation_comp_tasks_listening_task.py
View file
Open in desktop

This file was deleted.

Empty file added services/web/server/src/simcore_service_webserver/notifications/__init__.py
View file
Open in desktop
Empty file.
Loading