merge from main

Author: 11zhouxuan

.gitignore

@@ -129,7 +129,7 @@ cython_debug/
 .vscode/
 
 # data
-dmaa_models/
+emd_models/
 **artifacts
-src/pipeline/dmaa
+src/pipeline/emd
 *.log

README.md

@@ -25,9 +25,9 @@ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 python3 get-pip.py
 ```
 
-### Installing DMAA
+### Installing EMD
 
-To install the DMAA package, execute the following steps:
+To install the EMD package, execute the following steps:
 
 1. **(Optional)** Create and activate a virtual environment:
 
@@ -58,7 +58,7 @@ This command installs the package along with its dependencies.
 After successful installation, use the following command to access the CLI help:
 
 ```bash
-dmaa --help
+emd --help
 ```
 
-This command displays the available options and commands for the DMAA CLI.
+This command displays the available options and commands for the EMD CLI.

docs/time-sequence/applicability-check-after-initialization.md

@@ -7,17 +7,17 @@ sequenceDiagram
     autonumber
     actor User
     User->>+WebUI: List supported models for an application, e.g. Text2SQL
-    box rgb(243, 255, 242) DMAA App Layer
+    box rgb(243, 255, 242) EMD App Layer
     participant Application API
     end
 
-    box rgb(250, 233, 232) DMAA Core Layer
+    box rgb(250, 233, 232) EMD Core Layer
     participant Core API
     participant DB
     end
 
-    WebUI->>+Application API: Call dmaa.app.list_app('Text2SQL')
-    Application API->>Core API: Call dmaa.core.retrieve_db('Text2SQL')
+    WebUI->>+Application API: Call emd.app.list_app('Text2SQL')
+    Application API->>Core API: Call emd.core.retrieve_db('Text2SQL')
     Core API->>DB: Retrive relating db
     DB-->>Core API: Results of supported information relating to Text2SQL
     Core API-->>Application API: results from DB

docs/time-sequence/applicability-check-before-initialization.md

@@ -7,24 +7,24 @@ sequenceDiagram
     autonumber
     actor User
     User->>+WebUI: List supported models for an application, e.g. Text2SQL
-    box rgb(243, 255, 242) DMAA App Layer
+    box rgb(243, 255, 242) EMD App Layer
     participant Application API
     end
 
-    box rgb(250, 233, 232) DMAA Core Layer
+    box rgb(250, 233, 232) EMD Core Layer
     participant Core API
     participant DB
     end
 
-    WebUI->>+Application API: Call dmaa.app.list_app('Text2SQL')
-    Application API->>Core API: Call dmaa.core.retrieve_db('Text2SQL')
+    WebUI->>+Application API: Call emd.app.list_app('Text2SQL')
+    Application API->>Core API: Call emd.core.retrieve_db('Text2SQL')
     Core API->>DB: Retrive relating db
     DB-->>Core API: Db check results
     Core API-->>Application API: Fail to find valid db
-    Application API->>Core API: Call dmaa.core.initialize_db('Text2SQL')
-    Core API->>DB: Initialize db based on DMAA configuration file
+    Application API->>Core API: Call emd.core.initialize_db('Text2SQL')
+    Core API->>DB: Initialize db based on EMD configuration file
     DB-->>Core API: Initilization results
     Core API-->>Application API: Finish initilization
-    Application API-->>WebUI: applicability check results from DMAA configuration file
+    Application API-->>WebUI: applicability check results from EMD configuration file
     WebUI-->>User: display applicability check results: supported models/frameworks/infras/versions for Text2SQL
 ```

docs/time-sequence/model-invokement.md

@@ -7,22 +7,22 @@ sequenceDiagram
     autonumber
     actor User
     User->>+WebUI: Invoke model for Text2SQL_config(Text2SQL+Qwen2.5-72B-instruct+vllm+Sagemaker-g5.12x.large)
-        box rgb(243, 255, 242) DMAA App Layer
+        box rgb(243, 255, 242) EMD App Layer
         participant Application API
     end
 
-    box rgb(250, 233, 232) DMAA Core Layer
+    box rgb(250, 233, 232) EMD Core Layer
     participant Core API
     participant DB
     participant Sagemaker
     end
 
-    WebUI->>+Application API: Call dmaa.app.invoke(Text2SQL_config, param)
-    Application API->>Core API: Call dmaa.core.retrieve_db_deploy(Text2SQL_config)
+    WebUI->>+Application API: Call emd.app.invoke(Text2SQL_config, param)
+    Application API->>Core API: Call emd.core.retrieve_db_deploy(Text2SQL_config)
     Core API->>DB: retrieve db
     DB-->>Core API: The deploy task is finished
     Core API-->>Application API: The deploy task is finished
-    Application API->>Core API: Call dmaa.core.invoke() with parameters
+    Application API->>Core API: Call emd.core.invoke() with parameters
     Core API->>Sagemaker: Call sagemaker endpoint
     Sagemaker-->>Core API: Return inference results
     Core API-->>Application API: Return inference results

docs/time-sequence/resource-management-deploy-rolling.md

@@ -7,47 +7,47 @@ sequenceDiagram
     autonumber
     actor User
     User->>+WebUI: Deploy model for Text2SQL_config(Text2SQL+Qwen2.5-72B-instruct+vllm+Sagemaker-g5.12x.large)
-        box rgb(243, 255, 242) DMAA App Layer
+        box rgb(243, 255, 242) EMD App Layer
         participant Application API
     end
 
-    box rgb(250, 233, 232) DMAA Core Layer
+    box rgb(250, 233, 232) EMD Core Layer
     participant Core API
     participant Batch
     participant DB
     participant Sagemaker
     end
 
-    WebUI->>+Application API: Call dmaa.app.deploy(Text2SQL_config, rolling=True)
-    Application API->>Core API: Call dmaa.core.retrieve_db_deploy(Text2SQL_config)
+    WebUI->>+Application API: Call emd.app.deploy(Text2SQL_config, rolling=True)
+    Application API->>Core API: Call emd.core.retrieve_db_deploy(Text2SQL_config)
     Core API->>DB: Check the status of model/image/deploy task
     DB-->>Core API: Db resulsts of related task
     Core API-->>Application API: Model and image task id
     loop ModelTaskCheck
-        Application API->>Core API: Call dmaa.core.batch_job_check(Text2SQL_config, model)
+        Application API->>Core API: Call emd.core.batch_job_check(Text2SQL_config, model)
         Core API->>Batch: Model task check
         Batch-->>Core API: Batch job status
         Core API-->>Application API: Model task on-going
-        Application API->>Core API: Call dmaa.core.batch_job_check(Text2SQL_config, image)
+        Application API->>Core API: Call emd.core.batch_job_check(Text2SQL_config, image)
         Core API->>Batch: Image task check
         Batch-->>Core API: Batch job status
         Core API-->>Application API: Image task on-going
     end
-    Application API->>Core API: Call dmaa.core.update_db() for model/image task
+    Application API->>Core API: Call emd.core.update_db() for model/image task
     Core API->>DB: Update model/image to finished
     DB-->>Core API: Update results
     Core API-->>Application API: Update results
-    Application API->>Core API: Call dmaa.core.sagemaker_deploy() to deploy model
+    Application API->>Core API: Call emd.core.sagemaker_deploy() to deploy model
     Core API->>Sagemaker: Initilize Amazon sagemaker endpoint deployment
     Sagemaker-->>Core API: Amazon sagemaker deployment task id
     Core API-->>Application API: Launch the deployment task
     loop DeployTaskCheck
-        Application API->>Core API: Call dmaa.core.sagemaker_job_check(Text2SQL_config)
+        Application API->>Core API: Call emd.core.sagemaker_job_check(Text2SQL_config)
         Core API->>Sagemaker: deployment task check
         Sagemaker-->>Core API: deployment task on-going
         Core API-->>Application API: deployment task on-going
     end
-    Application API->>Core API: Call dmaa.core.update_db()
+    Application API->>Core API: Call emd.core.update_db()
     Core API->>DB: Update the status of model/image/deploy task
     DB-->>Core API: Task results
     Core API-->>Application API: Update model/image/deploy task status

docs/time-sequence/resource-management-deploy.md

@@ -7,30 +7,30 @@ sequenceDiagram
     autonumber
     actor User
     User->>+WebUI: Deploy model for Text2SQL_config(Text2SQL+Qwen2.5-72B-instruct+vllm+Sagemaker-g5.12x.large)
-        box rgb(243, 255, 242) DMAA App Layer
+        box rgb(243, 255, 242) EMD App Layer
         participant Application API
     end
 
-    box rgb(250, 233, 232) DMAA Core Layer
+    box rgb(250, 233, 232) EMD Core Layer
     participant Core API
     participant DB
     participant Batch
     end
 
-    WebUI->>+Application API: Call dmaa.app.deploy(Text2SQL_config)
-    Application API->>Core API: Call dmaa.core.retrieve_db_deploy(Text2SQL_config)
+    WebUI->>+Application API: Call emd.app.deploy(Text2SQL_config)
+    Application API->>Core API: Call emd.core.retrieve_db_deploy(Text2SQL_config)
     Core API->>DB: Check the status of model/image/deploy task
     DB-->>Core API: Task results
     Core API-->>Application API: No available model/image/deploy task status
-    Application API->>Core API: Call dmaa.core.model_prepare(Text2SQL_config)
+    Application API->>Core API: Call emd.core.model_prepare(Text2SQL_config)
     Core API->>Batch: Initilize batch job for preparing model file
     Batch-->>Core API: Batch job launched
     Core API-->>Application API: Batch job launched
-    Application API->>Core API: Call dmaa.core.image_build(Text2SQL_config)
+    Application API->>Core API: Call emd.core.image_build(Text2SQL_config)
     Core API->>Batch: Initilize batch job for building images
     Batch-->>Core API: Batch job launched
     Core API-->>Application API: Batch job launched
-    Application API->>Core API: Call dmaa.core.update_db()
+    Application API->>Core API: Call emd.core.update_db()
     Core API->>DB: Update the status of model/image/deploy task
     DB-->>Core API: Task results
     Core API-->>Application API: Update model/image/deploy task status

pybuild.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 COMMIT_HASH=$(git rev-parse --short=8 HEAD)
-sed -i "s/^COMMIT_HASH = .*/COMMIT_HASH = \"$COMMIT_HASH\"/" src/dmaa/revision.py
+sed -i "s/^COMMIT_HASH = .*/COMMIT_HASH = \"$COMMIT_HASH\"/" src/emd/revision.py
 poetry build

pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "dmaa"
+name = "emd"
 description = "Deploy Model Anywhere on AWS"
 version = "0.6.0"
 authors = [
@@ -11,9 +11,9 @@ readme = "README.md"
 
 [tool.poetry]
 packages = [
-    { include = "**/*", from = "src/dmaa", to = "dmaa" },
-    { include = "pipeline", from = "src", to = "dmaa" },
-    { include = "s5cmd", from = "assets", to = "dmaa/pipeline" }
+    { include = "**/*", from = "src/emd", to = "emd" },
+    { include = "pipeline", from = "src", to = "emd" },
+    { include = "s5cmd", from = "assets", to = "emd/pipeline" }
 ]
 exclude = [".venv"]
 
@@ -46,6 +46,6 @@ pytest = "^8.0.0"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 [tool.poetry.scripts]
-dmaa = "dmaa.cli:app"
+emd = "emd.cli:app"
 [project.scripts]
-dmaa = "dmaa.cli:app"
+emd = "emd.cli:app"