From 12c44e4fdbe8cb7dc2f131c2a4586c8b6f98def2 Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Tue, 16 Apr 2024 15:43:41 -0600
Subject: [PATCH] rebuild twiddles
---
.../app/workspaces/workspaces.component.ts | 1 -
services/capability/capability/server.py | 46 ++++++-------------
services/notification/notification/server.py | 1 -
services/workflow/workflow/server.py | 1 +
4 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/apps/web/src/app/workspaces/workspaces.component.ts b/apps/web/src/app/workspaces/workspaces.component.ts
index 9f68b84cb..5475d830b 100644
--- a/apps/web/src/app/workspaces/workspaces.component.ts
+++ b/apps/web/src/app/workspaces/workspaces.component.ts
@@ -27,5 +27,4 @@ export class WorkspacesComponent implements OnInit {
constructor() {}
ngOnInit(): void {}
-
}
diff --git a/services/capability/capability/server.py b/services/capability/capability/server.py
index 4529b2d67..ef49d2074 100644
--- a/services/capability/capability/server.py
+++ b/services/capability/capability/server.py
@@ -84,9 +84,7 @@ def add_cors_headers_response_callback(event: NewRequest):
# ---------------------------------------------------------
-def add_services(
- config: Configurator, session_factory: BeakerSessionFactoryConfig
-) -> Configurator:
+def add_services(config: Configurator, session_factory: BeakerSessionFactoryConfig) -> Configurator:
"""
Add capability info, capability service, and workflow service to Pyramid request configuration
@@ -97,12 +95,8 @@ def add_services(
# # these objects should exist across request boundaries
workflow_rest_client = WorkflowServiceRESTClient()
notification_rest_client = TransactionalNotificationSender(transaction.manager)
- capability_info = CapabilityInfo(
- get_tm_session(session_factory, transaction.manager)
- )
- state_machine_info = StateMachineInfo(
- get_tm_session(session_factory, transaction.manager)
- )
+ capability_info = CapabilityInfo(get_tm_session(session_factory, transaction.manager))
+ state_machine_info = StateMachineInfo(get_tm_session(session_factory, transaction.manager))
capability_service = CapabilityService(
capability_info,
state_machine_info,
@@ -137,19 +131,13 @@ def add_services(
)
# make capability launcher available for use in Pyramid
- config.add_request_method(
- create_capability_launcher, "capability_launcher", reify=True
- )
+ config.add_request_method(create_capability_launcher, "capability_launcher", reify=True)
# make capability queue starter available for use in Pyramid
- config.add_request_method(
- create_queue_restarter, "capability_queue_restarter", reify=True
- )
+ config.add_request_method(create_queue_restarter, "capability_queue_restarter", reify=True)
# make capability canceller available for use in Pyramid
- config.add_request_method(
- create_capability_canceller, "capability_canceller", reify=True
- )
+ config.add_request_method(create_capability_canceller, "capability_canceller", reify=True)
# make workflow_info available for use in Pyramid
config.add_request_method(
@@ -159,21 +147,15 @@ def add_services(
reify=True,
)
- config.add_request_method(
- lambda request: notification_rest_client, "notification_service", reify=True
- )
+ config.add_request_method(lambda request: notification_rest_client, "notification_service", reify=True)
# make archive_service available for use in Pyramid
- config.add_request_method(
- lambda request: archive_service, "archive_service", reify=True
- )
+ config.add_request_method(lambda request: archive_service, "archive_service", reify=True)
return config
def lookup_request(request):
- return request.capability_info.lookup_capability_request(
- request.matchdict["request_id"]
- )
+ return request.capability_info.lookup_capability_request(request.matchdict["request_id"])
# ---------------------------------------------------------
@@ -205,9 +187,7 @@ def get_tm_session(
# ---------------------------------------------------------
# Prometheus logging
-http_requests = Summary(
- "http_request_timing", "HTTP Requests", ["status_code", "route_name"]
-)
+http_requests = Summary("http_request_timing", "HTTP Requests", ["status_code", "route_name"])
def prometheus_route_timing_factory(handler, registry):
@@ -217,9 +197,9 @@ def prometheus_route_timing_factory(handler, registry):
response = handler(request)
end = time.time()
if request.matched_route:
- http_requests.labels(
- status_code=response.status_code, route_name=request.matched_route.name
- ).observe(end - start)
+ http_requests.labels(status_code=response.status_code, route_name=request.matched_route.name).observe(
+ end - start
+ )
return response
return prometheus_route_timer
diff --git a/services/notification/notification/server.py b/services/notification/notification/server.py
index bf49ffaee..656185186 100644
--- a/services/notification/notification/server.py
+++ b/services/notification/notification/server.py
@@ -49,7 +49,6 @@ def add_services(config: Configurator, session_factory: BeakerSessionFactoryConf
# make notification_info available for use in Pyramid
config.add_request_method(attach_session, "notification_info", reify=True)
-
config.add_request_method(lambda request: notification_service, "notification_service", reify=True)
return config
diff --git a/services/workflow/workflow/server.py b/services/workflow/workflow/server.py
index a6725959f..5aa9c0561 100644
--- a/services/workflow/workflow/server.py
+++ b/services/workflow/workflow/server.py
@@ -70,6 +70,7 @@ def lookup_workflow(request: Request) -> Workflow:
:param request: an HTTP request
:return: a Workflow object
"""
+
return request.info.lookup_workflow_definition(request.matchdict["name"])
--
GitLab