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.

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

remove sciml. #434

Merged
merged 3 commits into from
Sep 24, 2024
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
4 changes: 0 additions & 4 deletions architecture/system-arch.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
with Cluster("Simulation Services"):
pyciemss_api = Custom("pyciemss API", "./resources/pnnl.png")
pyciemss_worker = Custom("pyciemss Worker", "./resources/pnnl.png")
sciml_service = Custom("SciML Service", "./resources/sciml.png")

with Cluster("Knowledge Services"):
beaker = Custom("Beaker", "./resources/jataware.jpeg")
Expand Down Expand Up @@ -128,7 +127,6 @@
beaker >> Edge() << ingress_beaker
beaker >> Edge() >> mira
beaker >> Edge() >> openai
beaker >> Edge() >> sciml_service
climate_data_api >> Edge() >> climate_data_worker
climate_data_worker >> Edge() >> esgf
climate_data_worker >> Edge() >> openai
Expand Down Expand Up @@ -164,7 +162,6 @@
hmi_server >> Edge() >> pyciemss_api
hmi_server >> Edge() >> redis
hmi_server >> Edge() >> s3
hmi_server >> Edge() >> sciml_service
hmi_server >> Edge() >> skema_rs
hmi_server >> Edge() >> skema_tr
hmi_server >> Edge() >> skema_unified
Expand All @@ -183,7 +180,6 @@
pyciemss_worker >> Edge() >> hmi_server
pyciemss_worker >> Edge() >> message_queue
pyciemss_worker >> Edge() >> redis
sciml_service >> Edge() >> message_queue
skema_unified >> Edge() >> mit_tr
skema_unified >> Edge() >> skema_rs
text_extraction_taskrunner >> Edge() >> message_queue
Expand Down
7 changes: 0 additions & 7 deletions kubernetes/base/services/sciml-service/kustomization.yaml

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ spec:
secretKeyRef:
name: chat-gpt-secrets
key: chatgptkey
- name: SIMULATION-SERVICE_URL
value: 'http://sciml-service:3030'
- name: SKEMA-PY_URL
value: 'http://skema-py:4041'
- name: SKEMA-RS_URL
Expand Down
2 changes: 0 additions & 2 deletions kubernetes/overlays/prod/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ resources:
- ../../../base/services/mit
- ../../../base/services/pyciemss-service
- ../../../base/services/redis
- ../../../base/services/sciml-service
- ../../../base/services/skema
- ../../../base/services/text-extraction-taskrunner
- services/beaker/beaker-persistent-volume.yaml
Expand All @@ -43,7 +42,6 @@ patches:
- path: services/pyciemss-service/pyciemss-api-deployment.yaml
- path: services/pyciemss-service/pyciemss-worker-deployment.yaml
- path: services/redis/redis-deployment.yaml
- path: services/sciml-service/sciml-service-deployment.yaml
- path: services/skema/skema-mathjax-deployment.yaml
- path: services/skema/skema-memgraph-deployment.yaml
- path: services/skema/skema-rs-deployment.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ spec:
value: 'false'
- name: ENABLE_CHECKPOINTS
value: 'false'
- name: SIMULATION_SCHEDULER_URL
value: http://sciml-service:3030
- name: HMI_SERVER_URL
value: http://hmi-server:3000
- name: MIRA_REST_URL
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ software.uncharted.terarium/name=mira-taskrunner ghcr.io/darpa-askem/mira-taskru
software.uncharted.terarium/name=mit-tr ghcr.io/darpa-askem/mit-tr:latest
software.uncharted.terarium/name=pyciemss-api ghcr.io/darpa-askem/pyciemss-api:latest
software.uncharted.terarium/name=pyciemss-worker ghcr.io/darpa-askem/pyciemss-worker:latest
software.uncharted.terarium/name=sciml-service ghcr.io/darpa-askem/sciml-service:latest
software.uncharted.terarium/name=skema-mathjax ghcr.io/darpa-askem/skema-py:latest
software.uncharted.terarium/name=skema-rs ghcr.io/darpa-askem/skema-rs:latest
software.uncharted.terarium/name=skema-unified ghcr.io/darpa-askem/skema-py:latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,6 @@ spec:
port:
number: 6379

- host: 'sciml-service.dev.terarium.ai'
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: sciml-service
port:
number: 3030

- host: 'skema-rs.dev.terarium.ai'
http:
paths:
Expand Down Expand Up @@ -168,7 +157,6 @@ spec:
- 'mit-tr.dev.terarium.ai'
- 'pyciemss.dev.terarium.ai'
- 'redis.dev.terarium.ai'
- 'sciml-service.dev.terarium.ai'
- 'server.dev.terarium.ai'
- 'skema-rs.dev.terarium.ai'
- 'skema-unified.dev.terarium.ai'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ patches:
- path: services/pyciemss-service/pyciemss-api-service.yaml
- path: services/pyciemss-service/pyciemss-worker-deployment.yaml
- path: services/redis/redis-service.yaml
- path: services/sciml-service/sciml-service-deployment.yaml
- path: services/sciml-service/sciml-service-service.yaml
- path: services/skema/skema-rs-service.yaml
- path: services/skema/skema-unified-service.yaml
configMapGenerator:
Expand Down Expand Up @@ -97,11 +95,6 @@ images:
newName: ghcr.io/darpa-askem/mit-tr
newTag: 'latest'

# Simulation Service
- name: sciml-service-image
newName: ghcr.io/darpa-askem/sciml-service
newTag: 'latest'

# PyCIEMSS service
- name: pyciemss-api-image
newName: ghcr.io/darpa-askem/pyciemss-api
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ patches:
- path: services/gollm-taskrunner/gollm-taskrunner-deployment.yaml
- path: services/pyciemss-service/pyciemss-api-deployment.yaml
- path: services/pyciemss-service/pyciemss-worker-deployment.yaml
- path: services/sciml-service/sciml-service-deployment.yaml
images:
# Terarium HMI
- name: hmi-client-image
Expand Down Expand Up @@ -73,11 +72,6 @@ images:
newName: ghcr.io/darpa-askem/mit-tr
newTag: '1.0.0'

# Simulation Service
- name: sciml-service-image
newName: ghcr.io/darpa-askem/sciml-service
newTag: '1.2.0'

# PyCIEMSS service
- name: pyciemss-api-image
newName: ghcr.io/darpa-askem/pyciemss-api
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ software.uncharted.terarium/name=mira-taskrunner ghcr.io/darpa-askem/mira-taskru
software.uncharted.terarium/name=mit-tr ghcr.io/darpa-askem/mit-tr:latest
software.uncharted.terarium/name=pyciemss-api ghcr.io/darpa-askem/pyciemss-api:latest
software.uncharted.terarium/name=pyciemss-worker ghcr.io/darpa-askem/pyciemss-worker:latest
software.uncharted.terarium/name=sciml-service ghcr.io/darpa-askem/sciml-service:latest
software.uncharted.terarium/name=skema-mathjax ghcr.io/darpa-askem/skema-py:latest
software.uncharted.terarium/name=skema-rs ghcr.io/darpa-askem/skema-rs:latest
software.uncharted.terarium/name=skema-unified ghcr.io/darpa-askem/skema-py:latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,6 @@ spec:
port:
number: 6379

- host: 'sciml-service.staging.terarium.ai'
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: ssl-redirect
port:
name: use-annotation
- path: /
pathType: Prefix
backend:
service:
name: sciml-service
port:
number: 3030

- host: 'skema-rs.staging.terarium.ai'
http:
paths:
Expand Down Expand Up @@ -221,7 +203,6 @@ spec:
- 'mit-tr.staging.terarium.ai'
- 'pyciemss.staging.terarium.ai'
- 'redis.staging.terarium.ai'
- 'sciml-service.staging.terarium.ai'
- 'server.staging.terarium.ai'
- 'skema-rs.staging.terarium.ai'
- 'skema-unified.staging.terarium.ai'
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ patches:
- path: services/pyciemss-service/pyciemss-api-service.yaml
- path: services/pyciemss-service/pyciemss-worker-deployment.yaml
- path: services/redis/redis-service.yaml
- path: services/sciml-service/sciml-service-deployment.yaml
- path: services/sciml-service/sciml-service-service.yaml
- path: services/skema/skema-rs-service.yaml
- path: services/skema/skema-unified-service.yaml
images:
Expand Down Expand Up @@ -82,11 +80,6 @@ images:
newName: ghcr.io/darpa-askem/mit-tr
newTag: 'latest'

# Simulation Service
- name: sciml-service-image
newName: ghcr.io/darpa-askem/sciml-service
newTag: 'latest'

# PyCIEMSS service
- name: pyciemss-api-image
newName: ghcr.io/darpa-askem/pyciemss-api
Expand Down

This file was deleted.

This file was deleted.

Loading