Hide API key

screencoder/.gitignore

@@ -8,4 +8,4 @@ dist/
 .venv
 
 # API keys
-# doubao_api.txt
+doubao_api.txt

screencoder/block_parsor.py

@@ -130,13 +130,19 @@ def resolve_containment(bboxes: dict[str, tuple[int, int, int, int]]) -> dict[st
     return {name: bbox for name, bbox in bboxes.items() if name not in removed}
 
 # sequential version of bbox parsing: Using recursive detection with mask
-def sequential_component_detection(image_path: str, api_path: str, temp_dir: str) -> dict[str, tuple[int, int, int, int]]:
+def sequential_component_detection(image_path: str, temp_dir: str) -> dict[str, tuple[int, int, int, int]]:
     """
     Sequential processing flow: detect each component in turn, mask the image after each detection
     """
     bboxes = {}
     current_image_path = image_path
-    ark_client = Doubao(api_path)
+    
+    # Check for API key - first try environment variable, then use provided path
+    api_key = os.environ.get('API_key')
+    if not api_key:
+        print(f"Error: API key not found in environment variable 'API_key'")
+        exit(1)
+    ark_client = Doubao(api_key)
     
     image = cv2.imread(image_path)
     if image is None:
@@ -222,7 +228,7 @@ def main():
     tmp_dir = os.path.join(base_dir, 'data', 'tmp', run_id)
     
     image_path = os.path.join(tmp_dir, f"{run_id}.png")
-    api_path = os.path.join(base_dir, "doubao_api.txt")
+    # api_path = os.path.join(base_dir, "doubao_api.txt")
     json_output_path = os.path.join(tmp_dir, f"{run_id}_bboxes.json")
     annotated_image_output_path = os.path.join(tmp_dir, f"{run_id}_with_bboxes.png")
 
@@ -230,9 +236,9 @@ def main():
     print(f"Debug - base_dir: {base_dir}")
     print(f"Debug - tmp_dir: {tmp_dir}")
     print(f"Debug - image_path: {image_path}")
-    print(f"Debug - api_path: {api_path}")
+    # print(f"Debug - api_path: {api_path}")
     print(f"Debug - image_path exists: {os.path.exists(image_path)}")
-    print(f"Debug - api_path exists: {os.path.exists(api_path)}")
+    # print(f"Debug - api_path exists: {os.path.exists(api_path)}")
     
     # List contents of tmp_dir if it exists
     if os.path.exists(tmp_dir):
@@ -246,15 +252,17 @@ def main():
         save_bboxes_to_json({}, json_output_path)
         exit(1)
     
-    if not os.path.exists(api_path):
-        print(f"Error: API key file not found at {api_path}")
+    api_key = os.environ.get('API_key')
+    if not api_key:
+        print(f"Error: API key not found in environment variable 'API_key'")
         # Create empty json file so the pipeline doesn't break
         save_bboxes_to_json({}, json_output_path)
         exit(1)
 
     print(f"--- Starting BBox Parsing for run_id: {run_id} ---")
     
-    client = Doubao(api_path)
+    # Use environment variable if available, otherwise use file path
+    client = Doubao(api_key)
     base64_image = encode_image(image_path)
     if not base64_image:
         print(f"Error: Failed to encode image {image_path}")

screencoder/html_generator.py

@@ -299,12 +299,15 @@ def main():
     
     generate_html(root, output_html_path)
 
-    api_path = os.path.join(base_dir, "doubao_api.txt")
-    if not os.path.exists(api_path):
-        print(f"Error: API key not found at {api_path}")
+    # Check for API key - first try environment variable, then file
+    api_key = os.environ.get('API_key')
+    # api_path = os.path.join(base_dir, "doubao_api.txt")
+    if not api_key:
+        print(f"Error: API key not found in environment variable 'API_key'")
         exit(1)
     
-    bot = Doubao(api_path, model="doubao-1.5-thinking-vision-pro-250428")
+    # Use environment variable if available, otherwise use file path
+    bot = Doubao(api_key, model="doubao-1.5-thinking-vision-pro-250428")
     code_dict = generate_code_parallel(root, img_path, bot, user_instruction)
     code_substitution(output_html_path, code_dict)