minimize clickable events and ensure correct paths, add entrypoint to docker for hot reloading on dev mode

Author: ahmedkhaleel2004

backend/Dockerfile

@@ -13,8 +13,16 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy application code
 COPY . .
 
+# Create and set permissions for entrypoint script
+COPY entrypoint.sh /app/
+RUN chmod +x /app/entrypoint.sh && \
+    # Ensure the script uses Unix line endings
+    sed -i 's/\r$//' /app/entrypoint.sh && \
+    # Double check permissions
+    ls -la /app/entrypoint.sh
+
 # Expose port
 EXPOSE 8000
 
-# Run the application
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--workers", "2"]
+# Use entrypoint script
+CMD ["/bin/bash", "/app/entrypoint.sh"]

backend/app/prompts.py

@@ -133,7 +133,7 @@
 - Do not try to include the full url. This will be processed by another program afterwards. All you need to do is include the path.
 - For example:
   - This is a correct click event: `click Example "app/example.js"`
-  - This is an incorrect click event: `click Example "https://github.com/username/repo/tree/main/app/example.js"`
+  - This is an incorrect click event: `click Example "https://github.com/username/repo/blob/main/app/example.js"`
 - Do this for as many components as specified in the component mapping, include directories and files.
   - If you believe the component contains files and is a directory, include the directory path.
   - If you believe the component references a specific file, include the file path.

backend/app/routers/generate.py

@@ -8,6 +8,7 @@
 from anthropic._exceptions import RateLimitError
 from pydantic import BaseModel
 from functools import lru_cache
+import re
 
 load_dotenv()
 
@@ -122,11 +123,13 @@ async def generate(request: Request, body: ApiRequest):
         if "BAD_INSTRUCTIONS" in mermaid_code:
             return {"error": "Invalid or unclear instructions provided"}
 
-        # Process the diagram text before sending to client
-        processed_diagram = mermaid_code\
-            .replace("[username]", body.username)\
-            .replace("[repo]", body.repo)\
-            .replace("[branch]", default_branch)
+        # Process click events to include full GitHub URLs
+        processed_diagram = process_click_events(
+            mermaid_code,
+            body.username,
+            body.repo,
+            default_branch
+        )
 
         print("component_mapping_text:", component_mapping_text)
 
@@ -167,3 +170,28 @@ async def get_generation_cost(request: Request, body: ApiRequest):
         return {"cost": cost_string}
     except Exception as e:
         return {"error": str(e)}
+
+
+def process_click_events(diagram: str, username: str, repo: str, branch: str) -> str:
+    """
+    Process click events in Mermaid diagram to include full GitHub URLs.
+    Detects if path is file or directory and uses appropriate URL format.
+    """
+    def replace_path(match):
+        # Extract the path from the click event
+        path = match.group(2).strip('"\'')
+
+        # Determine if path is likely a file (has extension) or directory
+        is_file = '.' in path.split('/')[-1]
+
+        # Construct GitHub URL
+        base_url = f"https://github.com/{username}/{repo}"
+        path_type = "blob" if is_file else "tree"
+        full_url = f"{base_url}/{path_type}/{branch}/{path}"
+
+        # Return the full click event with the new URL
+        return f'click {match.group(1)} "{full_url}"'
+
+    # Match click events: click ComponentName "path/to/something"
+    click_pattern = r'click ([^\s"]+)\s+"([^"]+)"'
+    return re.sub(click_pattern, replace_path, diagram)

backend/deploy.sh

@@ -11,7 +11,7 @@ git pull origin main
 
 # Build and restart containers
 docker-compose down
-docker-compose up --build -d
+ENVIRONMENT=production docker-compose up --build -d
 
 # Remove unused images
 docker image prune -f

backend/entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$ENVIRONMENT" = "development" ]; then
+    exec uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload
+else
+    exec uvicorn app.main:app --host 0.0.0.0 --port 8000 --workers 2
+fi

docker-compose.yml

@@ -9,4 +9,6 @@ services:
       - ./backend:/app
     env_file:
       - .env
-    restart: unless-stopped # Automatically restarts if container crashes
+    environment:
+      - ENVIRONMENT=development
+    restart: unless-stopped