refactor: rename constants MATMASTER_ACCESS_KEY and MATMASTER_PROJECT_ID to MATERIALS_ACCESS_KEY and MATERIALS_PROJECT_ID for clarity and consistency

Author: Rasic2

agents/matmaster_agent/base_agents/callback.py

@@ -20,8 +20,8 @@
     CURRENT_ENV,
     FRONTEND_STATE_KEY,
     LOCAL_EXECUTOR,
-    MATMASTER_ACCESS_KEY,
-    MATMASTER_PROJECT_ID,
+    MATERIALS_ACCESS_KEY,
+    MATERIALS_PROJECT_ID,
     OPENAPI_HOST,
     Transfer2Agent,
 )
@@ -213,7 +213,7 @@ def _inject_projectId(ctx: Union[InvocationContext, ToolContext], executor, stor
 
 
 def _inject_username(ctx: Union[InvocationContext, ToolContext], executor):
-    username = ak_to_username(access_key=MATMASTER_ACCESS_KEY)
+    username = ak_to_username(access_key=MATERIALS_ACCESS_KEY)
     if username:
         if executor is not None:
             if executor['type'] == 'dispatcher':  # BohriumExecutor
@@ -231,7 +231,7 @@ def _inject_username(ctx: Union[InvocationContext, ToolContext], executor):
 
 
 def _inject_ticket(ctx: Union[InvocationContext, ToolContext], executor):
-    ticket = ak_to_ticket(access_key=MATMASTER_ACCESS_KEY)
+    ticket = ak_to_ticket(access_key=MATERIALS_ACCESS_KEY)
     if ticket:
         if executor is not None:
             if executor['type'] == 'dispatcher':  # BohriumExecutor
@@ -316,14 +316,14 @@ async def wrapper(
             job_create_url = f"{OPENAPI_HOST}/openapi/v1/job/create"
             user_project_list_url = f"{OPENAPI_HOST}/openapi/v1/open/user/project/list"
             payload = {
-                'projectId': MATMASTER_PROJECT_ID,
+                'projectId': MATERIALS_PROJECT_ID,
                 'name': 'check_job_create',
             }
-            params = {'accessKey': MATMASTER_ACCESS_KEY}
+            params = {'accessKey': MATERIALS_ACCESS_KEY}
 
             logger.info(
-                f"[check_job_create] project_id = {MATMASTER_PROJECT_ID}, "
-                f"ak = {MATMASTER_ACCESS_KEY}"
+                f"[check_job_create] project_id = {MATERIALS_PROJECT_ID}, "
+                f"ak = {MATERIALS_ACCESS_KEY}"
             )
 
             async with aiohttp.ClientSession() as session:
@@ -335,7 +335,7 @@ async def wrapper(
                     project_name = [
                         item['project_name']
                         for item in res['data']['items']
-                        if item['project_id'] == MATMASTER_PROJECT_ID
+                        if item['project_id'] == MATERIALS_PROJECT_ID
                     ][0]
 
             async with aiohttp.ClientSession() as session:

agents/matmaster_agent/base_agents/job_agent.py

@@ -35,8 +35,8 @@
     LOADING_START,
     LOADING_STATE_KEY,
     LOADING_TITLE,
-    MATMASTER_ACCESS_KEY,
-    MATMASTER_PROJECT_ID,
+    MATERIALS_ACCESS_KEY,
+    MATERIALS_PROJECT_ID,
     TMP_FRONTEND_STATE_KEY,
     ModelRole,
     OpenAPIJobAPI,
@@ -549,12 +549,12 @@ async def _run_async_impl(
             await self.tools[0].get_tools()
             if not ctx.session.state['dflow']:
                 access_key, Executor, BohriumStorge = (
-                    MATMASTER_ACCESS_KEY,
+                    MATERIALS_ACCESS_KEY,
                     get_BohriumExecutor(),
                     get_BohriumStorage(),
                 )
                 project_id, Executor, BohriumStorge = (
-                    MATMASTER_PROJECT_ID,
+                    MATERIALS_PROJECT_ID,
                     Executor,
                     BohriumStorge,
                 )

agents/matmaster_agent/callback.py

@@ -11,7 +11,7 @@
 from google.genai import types
 from google.genai.types import FunctionCall, Part
 
-from agents.matmaster_agent.constant import FRONTEND_STATE_KEY, MATMASTER_ACCESS_KEY
+from agents.matmaster_agent.constant import FRONTEND_STATE_KEY, MATERIALS_ACCESS_KEY
 from agents.matmaster_agent.locales import i18n
 from agents.matmaster_agent.model import UserContent
 from agents.matmaster_agent.prompt import get_user_content_lang
@@ -128,7 +128,7 @@ async def matmaster_check_job_status(
                     '[matmaster_check_job_status] new LlmResponse, prepare call API'
                 )
                 job_status = await get_job_status(
-                    job_query_url, access_key=MATMASTER_ACCESS_KEY
+                    job_query_url, access_key=MATERIALS_ACCESS_KEY
                 )  # 查询任务的最新状态
                 callback_context.state['new_query_job_status'][
                     'origin_job_id'

agents/matmaster_agent/constant.py

@@ -38,16 +38,16 @@
 
 OpenAPIJobAPI = f"{OPENAPI_HOST}/openapi/v1/job"
 
-MATMASTER_ACCESS_KEY = str(os.getenv('MATMASTER_ACCESS_KEY'))
-MATMASTER_PROJECT_ID = int(os.getenv('MATMASTER_PROJECT_ID'))
+MATERIALS_ACCESS_KEY = str(os.getenv('MATERIALS_ACCESS_KEY'))
+MATERIALS_PROJECT_ID = int(os.getenv('MATERIALS_PROJECT_ID'))
 
 # Bohrium Constant
 BohriumStorge = {
     'type': 'https',
     'plugin': {
         'type': 'bohrium',
-        'access_key': MATMASTER_ACCESS_KEY,
-        'project_id': MATMASTER_PROJECT_ID,
+        'access_key': MATERIALS_ACCESS_KEY,
+        'project_id': MATERIALS_PROJECT_ID,
         'app_key': 'agent',
     },
 }
@@ -59,15 +59,15 @@
         'batch_type': 'OpenAPI',
         'context_type': 'OpenAPI',
         'remote_profile': {
-            'access_key': MATMASTER_ACCESS_KEY,
-            'project_id': MATMASTER_PROJECT_ID,
+            'access_key': MATERIALS_ACCESS_KEY,
+            'project_id': MATERIALS_PROJECT_ID,
             'app_key': 'agent',
             'image_address': '',
             'platform': 'ali',
             'machine_type': 'c2_m8_cpu',
         },
     },
-    'resources': {'envs': {'BOHRIUM_PROJECT_ID': MATMASTER_PROJECT_ID}},
+    'resources': {'envs': {'BOHRIUM_PROJECT_ID': MATERIALS_PROJECT_ID}},
 }
 
 DFlowExecutor = {
@@ -78,8 +78,8 @@
         'DFLOW_K8S_API_SERVER': DFLOW_K8S_API_SERVER,
         'DFLOW_S3_REPO_KEY': 'oss-bohrium',
         'DFLOW_S3_STORAGE_CLIENT': 'dflow.plugins.bohrium.TiefblueClient',
-        'BOHRIUM_ACCESS_KEY': MATMASTER_ACCESS_KEY,
-        'BOHRIUM_PROJECT_ID': str(MATMASTER_PROJECT_ID),
+        'BOHRIUM_ACCESS_KEY': MATERIALS_ACCESS_KEY,
+        'BOHRIUM_PROJECT_ID': str(MATERIALS_PROJECT_ID),
         'BOHRIUM_APP_KEY': 'agent',
     },
 }