From 5e31b20cf30e652dae32a8483cfd35671aee550d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Malinowski?= Date: Thu, 6 Jun 2024 17:49:36 +0100 Subject: [PATCH 1/4] Create catalog-info.yaml --- catalog-info.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 catalog-info.yaml diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 00000000..0f6f02cc --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,15 @@ +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab + title: xchemlab + description: A collection of services which comprise the XChemLab deployment + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis \ No newline at end of file From 96d8ad4705f8185a901601fdf317d938ceade3e3 Mon Sep 17 00:00:00 2001 From: Stanislaw Malinowski Date: Tue, 11 Jun 2024 10:03:18 +0100 Subject: [PATCH 2/4] split into frontend and backend --- catalog-info.yaml | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 0f6f02cc..bca68ad1 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -1,9 +1,43 @@ apiVersion: backstage.io/v1alpha1 -kind: Component +kind: System metadata: name: XChemLab title: xchemlab - description: A collection of services which comprise the XChemLab deployment + description: A collection of services which comprise the XChemLab deployment + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - MX +spec: + type: application + lifecycle: production + owner: group:data-analysis +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab frontend + title: xchemlab-frontend + description: XChemLab frontend itnerface + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Typescript + - React +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend annotations: backstage.io/techdocs-ref: dir:. github.com/project-slug: DiamondLightSource/xchemlab @@ -12,4 +46,5 @@ metadata: spec: type: application lifecycle: production - owner: group:data-analysis \ No newline at end of file + owner: group:data-analysis + system: XChemLab From 0ee0f3d149712e680f695068ec3c60c514b072cd Mon Sep 17 00:00:00 2001 From: Stanislaw Malinowski Date: Tue, 11 Jun 2024 17:07:28 +0100 Subject: [PATCH 3/4] DRAFT half done of the detailed-backedn --- catalog-info.yaml | 129 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/catalog-info.yaml b/catalog-info.yaml index bca68ad1..7d8611c2 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -34,6 +34,134 @@ spec: --- apiVersion: backstage.io/v1alpha1 kind: Component +metadata: + name: CHiMP Chomp + title: chimp-chomp + description: worker reading jobs from RabbitMQ queue, doing batch inference and returning results to anoter RMQ queue. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust + - worker + - machine learning + - zero service scaling +spec: + type: worker + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab + +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab + +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab + +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab + +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab + +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: XChemLab backend + title: xchemlab-backend + description: XChemLab backend + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab + tags: + - Rust +spec: + type: application + lifecycle: production + owner: group:data-analysis + system: XChemLab + +--- +apiVersion: backstage.io/v1alpha1 +kind: Component metadata: name: XChemLab backend title: xchemlab-backend @@ -48,3 +176,4 @@ spec: lifecycle: production owner: group:data-analysis system: XChemLab + From a5fc6d611633cdf6e413ed11b1947c265a93f1de Mon Sep 17 00:00:00 2001 From: Stanislaw Malinowski Date: Mon, 1 Jul 2024 15:10:34 +0100 Subject: [PATCH 4/4] develop out the catalog-info --- catalog-info.yaml | 204 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 158 insertions(+), 46 deletions(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 7d8611c2..63b795a1 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -19,10 +19,10 @@ kind: Component metadata: name: XChemLab frontend title: xchemlab-frontend - description: XChemLab frontend itnerface + description: XChemLab frontend interface annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/frontend tags: - Typescript - React @@ -37,10 +37,10 @@ kind: Component metadata: name: CHiMP Chomp title: chimp-chomp - description: worker reading jobs from RabbitMQ queue, doing batch inference and returning results to anoter RMQ queue. + description: Worker reading jobs from RabbitMQ queue, doing batch inference, and returning results to another RMQ queue. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/chimp_chomp tags: - Rust - worker @@ -55,125 +55,237 @@ spec: apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: chimp_controller + title: chimp-controller + description: Controller service for managing images and predictions. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/chimp_controller tags: - Rust spec: - type: application + type: service lifecycle: production owner: group:data-analysis system: XChemLab - --- apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: compound_library + title: compound-library + description: Service related to compound instances and types. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/compound_library tags: - Rust spec: - type: application + type: service lifecycle: production owner: group:data-analysis system: XChemLab - --- apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: compound_soaking + title: compound-soaking + description: Service related to soaking compounds. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/compound_soaking tags: - Rust spec: - type: application + type: service lifecycle: production owner: group:data-analysis system: XChemLab - --- apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: crystal_library + title: crystal-library + description: Service managing crystal plates and wells. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/crystal_library tags: - Rust spec: - type: application + type: service lifecycle: production owner: group:data-analysis system: XChemLab - --- apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: pin_packing + title: pin-packing + description: Service related to pin packing, including managing canes, pins, and pucks. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/pin_packing tags: - Rust spec: - type: application + type: service lifecycle: production owner: group:data-analysis system: XChemLab - --- apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: soakdb_io + title: soakdb-io + description: Service managing data types and tables related to soak databases. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/soakdb_io tags: - Rust spec: - type: application + type: service lifecycle: production owner: group:data-analysis system: XChemLab - --- apiVersion: backstage.io/v1alpha1 kind: Component metadata: - name: XChemLab backend - title: xchemlab-backend - description: XChemLab backend + name: soakdb_sync + title: soakdb-sync + description: Service for syncing soak databases. annotations: backstage.io/techdocs-ref: dir:. - github.com/project-slug: DiamondLightSource/xchemlab + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/soakdb_sync tags: - Rust spec: - type: application + type: service + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: targeting + title: targeting + description: Service for image and prediction management. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/targeting + tags: + - Rust +spec: + type: service + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: the_paginator + title: the-paginator + description: Service handling pagination. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/the_paginator + tags: + - Rust +spec: + type: service + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: graphql_endpoints + title: graphql-endpoints + description: GraphQL service endpoints. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/graphql_endpoints + tags: + - Rust +spec: + type: service + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: graphql_event_broker + title: graphql-event-broker + description: Broker for GraphQL events. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/graphql_event_broker + tags: + - Rust +spec: + type: service + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: opa_client + title: opa-client + description: OPA client service for GraphQL queries. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/opa_client + tags: + - Rust +spec: + type: service + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: chimp_protocol + title: chimp-protocol + description: Library for the CHiMP protocol. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/chimp_protocol + tags: + - Rust +spec: + type: library + lifecycle: production + owner: group:data-analysis + system: XChemLab +--- +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: soakdb_io_library + title: soakdb-io-library + description: Library managing various datatypes in soakdb_io. + annotations: + backstage.io/techdocs-ref: dir:. + github.com/project-slug: DiamondLightSource/xchemlab/tree/main/backend/soakdb_io + tags: + - Rust +spec: + type: library lifecycle: production owner: group:data-analysis system: XChemLab -