Merge pull request #233 from AnguseZhang/chore/update-script

refactor: consolidate API constants for improved import structure and…

Author: Rasic2

agents/matmaster_agent/constant.py

@@ -37,6 +37,8 @@
     BOHRIUM_API_URL = 'https://bohrium-api.dp.tech'
 
 OpenAPIJobAPI = f"{OPENAPI_HOST}/openapi/v1/sandbox/job"
+OPENAPI_JOB_CREATE_API = f'{OpenAPIJobAPI}/create'
+OPENAPI_FILE_TOKEN_API = f'{OpenAPIJobAPI}/file/token'
 
 MATERIALS_ACCESS_KEY = str(os.getenv('MATERIALS_ACCESS_KEY'))
 MATERIALS_PROJECT_ID = int(os.getenv('MATERIALS_PROJECT_ID'))

scripts/constant.py

@@ -10,8 +10,8 @@
 from dotenv import find_dotenv, load_dotenv
 from toolsy.logger import init_colored_logger
 
+from agents.matmaster_agent.constant import OPENAPI_FILE_TOKEN_API, OpenAPIJobAPI
 from agents.matmaster_agent.utils.job_utils import mapping_status
-from scripts.constant import FILE_TOKEN_API, JOB_DETAIL_API
 
 load_dotenv(find_dotenv())
 
@@ -88,7 +88,7 @@ def get_token_and_download_file(file_path, job_id):
     # 获取log文件的token
     request_body = {'filePath': file_path, 'jobId': job_id}
     response = requests.post(
-        f"{FILE_TOKEN_API}?accessKey={os.getenv('MATERIALS_ACCESS_KEY')}",
+        f"{OPENAPI_FILE_TOKEN_API}?accessKey={os.getenv('MATERIALS_ACCESS_KEY')}",
         json=request_body,
     )
     response.raise_for_status()
@@ -129,7 +129,7 @@ def main():
 
     try:
         response = requests.get(
-            f"{JOB_DETAIL_API}/{args.job_id}?accessKey={os.getenv('MATERIALS_ACCESS_KEY')}"
+            f"{OpenAPIJobAPI}/{args.job_id}?accessKey={os.getenv('MATERIALS_ACCESS_KEY')}"
         )
         response.raise_for_status()
         job_info = response.json()

scripts/get_acs_result.py

@@ -0,0 +1,19 @@
+import os
+
+import requests
+from dotenv import find_dotenv, load_dotenv
+
+from agents.matmaster_agent.constant import OPENAPI_JOB_CREATE_API
+
+load_dotenv(find_dotenv())
+
+MATERIALS_ACCESS_KEY = os.getenv('MATERIALS_ACCESS_KEY')
+MATERIALS_PROJECT_ID = os.getenv('MATERIALS_PROJECT_ID')
+
+request_body_json = {'projectId': MATERIALS_PROJECT_ID, 'name': 'demo_job'}
+request_query_string = {'accessKey': MATERIALS_ACCESS_KEY}
+
+response = requests.post(
+    OPENAPI_JOB_CREATE_API, json=request_body_json, params=request_query_string
+)
+print(response)