Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,6 @@ WEBSERVER_PROFILING=1
WEBSERVER_PROJECTS={}
WEBSERVER_PROMETHEUS_API_VERSION=v1
WEBSERVER_PROMETHEUS_URL=http://prometheus:9090
WEBSERVER_PUBLICATIONS=1
WEBSERVER_REALTIME_COLLABORATION='{"RTC_MAX_NUMBER_OF_USERS":3}'
WEBSERVER_SCICRUNCH={}
WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
Expand Down
24 changes: 0 additions & 24 deletions api/specs/web-server/_publications.py

This file was deleted.

1 change: 0 additions & 1 deletion api/specs/web-server/openapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"_projects_tags",
"_projects_wallet",
"_projects_workspaces",
"_publications",
"_resource_usage",
"_statics",
"_storage",
Expand Down
4 changes: 0 additions & 4 deletions services/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,6 @@ services:
WEBSERVER_FUNCTIONS: ${WEBSERVER_FUNCTIONS} # needed for front-end
WEBSERVER_GROUPS: ${WEBSERVER_GROUPS}
WEBSERVER_PRODUCTS: ${WEBSERVER_PRODUCTS}
WEBSERVER_PUBLICATIONS: ${WEBSERVER_PUBLICATIONS}
WEBSERVER_SOCKETIO: ${WEBSERVER_SOCKETIO}
WEBSERVER_TAGS: ${WEBSERVER_TAGS}
WEBSERVER_USERS: ${WEBSERVER_USERS}
Expand Down Expand Up @@ -1179,7 +1178,6 @@ services:
WEBSERVER_PORT: ${WEBSERVER_PORT}
WEBSERVER_PRODUCTS: ${WB_GC_PRODUCTS}
WEBSERVER_PROJECTS: ${WB_GC_PROJECTS}
WEBSERVER_PUBLICATIONS: ${WB_GC_PUBLICATIONS}
WEBSERVER_RPC_NAMESPACE: webserver
WEBSERVER_SCICRUNCH: ${WB_GC_SCICRUNCH}
WEBSERVER_SOCKETIO: ${WB_GC_SOCKETIO}
Expand Down Expand Up @@ -1274,7 +1272,6 @@ services:
WEBSERVER_PRODUCTS: 1
WEBSERVER_PROFILING: ${WB_AUTH_PROFILING}
WEBSERVER_PROJECTS: "null"
WEBSERVER_PUBLICATIONS: 0
WEBSERVER_RABBITMQ: "null"
WEBSERVER_REALTIME_COLLABORATION: "null"
WEBSERVER_REDIS: "null"
Expand Down Expand Up @@ -1346,7 +1343,6 @@ services:
WEBSERVER_NOTIFICATIONS: ${WB_DB_EL_NOTIFICATIONS}
WEBSERVER_PRODUCTS: ${WB_DB_EL_PRODUCTS}
WEBSERVER_PROJECTS: ${WB_DB_EL_PROJECTS}
WEBSERVER_PUBLICATIONS: ${WB_DB_EL_PUBLICATIONS}
WEBSERVER_SCICRUNCH: ${WB_DB_EL_SCICRUNCH}
WEBSERVER_SOCKETIO: ${WB_DB_EL_SOCKETIO}
WEBSERVER_STATICWEB: ${WB_DB_EL_STATICWEB}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"openapi": "3.1.0",
"info": {
Expand Down Expand Up @@ -10741,31 +10741,6 @@
}
}
},
"/v0/publications/service-submission": {
"post": {
"tags": [
"publication"
],
"summary": "Service Submission",
"description": "Submits files with new service candidate",
"operationId": "service_submission",
"requestBody": {
"content": {
"multipart/form-data": {
"schema": {
"$ref": "#/components/schemas/Body_service_submission"
}
}
},
"required": true
},
"responses": {
"204": {
"description": "Successful Response"
}
}
}
},
"/v0/services/-/resource-usages": {
"get": {
"tags": [
Expand Down Expand Up @@ -14442,21 +14417,6 @@
],
"title": "Author"
},
"Body_service_submission": {
"properties": {
"file": {
"type": "string",
"format": "binary",
"title": "File",
"description": "metadata.json submission file"
}
},
"type": "object",
"required": [
"file"
],
"title": "Body_service_submission"
},
"BootChoice": {
"properties": {
"label": {
Expand Down Expand Up @@ -28494,8 +28454,7 @@
"change_email_email.jinja2",
"new_2fa_code.jinja2",
"registration_email.jinja2",
"reset_password_email.jinja2",
"service_submission.jinja2"
"reset_password_email.jinja2"
],
"title": "Template Name",
"default": "registration_email.jinja2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
from .payments.plugin import setup_payments
from .products.plugin import setup_products
from .projects.plugin import setup_projects
from .publications.plugin import setup_publications
from .rabbitmq import setup_rabbitmq
from .redis import setup_redis
from .resource_manager.plugin import setup_resource_manager
Expand Down Expand Up @@ -101,7 +100,7 @@ async def _finished_banner(app: web.Application):
return _finished_banner


def create_application(tracing_config: TracingConfig) -> web.Application:
def create_application(tracing_config: TracingConfig) -> web.Application: # noqa: PLR0915
"""
Initializes service
"""
Expand Down Expand Up @@ -187,7 +186,6 @@ def create_application(tracing_config: TracingConfig) -> web.Application:
setup_tags(app)

setup_announcements(app)
setup_publications(app)
setup_studies_dispatcher(app)
setup_exporter(app)
setup_realtime_collaboration(app)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
WEBSERVER_NOTIFICATIONS: bool = True
WEBSERVER_PRODUCTS: bool = True
WEBSERVER_PROFILING: bool = False
WEBSERVER_PUBLICATIONS: bool = True
WEBSERVER_REMOTE_DEBUG: bool = True
WEBSERVER_SOCKETIO: bool = True
WEBSERVER_TAGS: bool = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import functools
import logging
from typing import Any, TypeAlias
from typing import Any

from aiohttp import web
from common_library.pydantic_fields_extension import get_type, is_nullable
Expand All @@ -19,7 +19,7 @@

_logger = logging.getLogger(__name__)

AppConfigDict: TypeAlias = dict[str, Any]
type AppConfigDict = dict[str, Any]


def convert_to_app_config(app_settings: ApplicationSettings) -> AppConfigDict:
Expand All @@ -31,7 +31,7 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> AppConfigDict:
"host": app_settings.WEBSERVER_SERVER_HOST,
"port": app_settings.WEBSERVER_PORT,
"log_level": f"{app_settings.WEBSERVER_LOGLEVEL}",
"testing": False, # TODO: deprecate!
"testing": False, # deprecate!
"studies_access_enabled": (
int(app_settings.WEBSERVER_STUDIES_DISPATCHER.STUDIES_ACCESS_ANONYMOUS_ALLOWED)
if app_settings.WEBSERVER_STUDIES_DISPATCHER
Expand All @@ -45,7 +45,10 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> AppConfigDict:
"db": {
"postgres": {
"database": getattr(app_settings.WEBSERVER_DB, "POSTGRES_DB", None),
"endpoint": f"{getattr(app_settings.WEBSERVER_DB, 'POSTGRES_HOST', None)}:{getattr(app_settings.WEBSERVER_DB, 'POSTGRES_PORT', None)}",
"endpoint": (
f"{getattr(app_settings.WEBSERVER_DB, 'POSTGRES_HOST', None)}:"
f"{getattr(app_settings.WEBSERVER_DB, 'POSTGRES_PORT', None)}"
),
"host": getattr(app_settings.WEBSERVER_DB, "POSTGRES_HOST", None),
"maxsize": getattr(app_settings.WEBSERVER_DB, "POSTGRES_MAXSIZE", None),
"minsize": getattr(app_settings.WEBSERVER_DB, "POSTGRES_MINSIZE", None),
Expand Down Expand Up @@ -144,7 +147,6 @@ def convert_to_app_config(app_settings: ApplicationSettings) -> AppConfigDict:
"exporter": {"enabled": app_settings.WEBSERVER_EXPORTER is not None},
"groups": {"enabled": app_settings.WEBSERVER_GROUPS},
"products": {"enabled": app_settings.WEBSERVER_PRODUCTS},
"publications": {"enabled": app_settings.WEBSERVER_PUBLICATIONS},
"remote_debug": {"enabled": app_settings.WEBSERVER_REMOTE_DEBUG},
"security": {"enabled": True},
"scicrunch": {"enabled": app_settings.WEBSERVER_SCICRUNCH is not None},
Expand Down Expand Up @@ -179,7 +181,7 @@ def _set_if_disabled(field_name, section):
field = dict(ApplicationSettings.model_fields)[field_name]
if not enabled:
envs[field_name] = "null" if is_nullable(field) else "0"
elif get_type(field) == bool:
elif get_type(field) is bool:
envs[field_name] = "1"

if main := cfg.get("main"):
Expand Down Expand Up @@ -281,7 +283,6 @@ def _set_if_disabled(field_name, section):
"WEBSERVER_GROUPS",
"WEBSERVER_PRODUCTS",
"WEBSERVER_PROJECTS",
"WEBSERVER_PUBLICATIONS",
"WEBSERVER_REMOTE_DEBUG",
"WEBSERVER_REST",
"WEBSERVER_SOCKETIO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class TestEmail(BaseModel):
"new_2fa_code.jinja2",
"registration_email.jinja2",
"reset_password_email.jinja2",
"service_submission.jinja2",
] = "registration_email.jinja2"
template_context: dict[str, Any] = {}

Expand Down

This file was deleted.

Loading
Loading