diff --git a/.github/workflows/architecture.yml b/.github/workflows/architecture.yml
new file mode 100644
index 00000000..f02b2862
--- /dev/null
+++ b/.github/workflows/architecture.yml
@@ -0,0 +1,48 @@
+name: Generate Architecture Diagram
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y graphviz graphviz-dev
+          python -m pip install --upgrade pip
+          pip install diagrams
+          
+      - name: List directory before
+        run: ls -la
+        
+      - name: Create architecture diagram
+        run: |
+          python architecture_generator.py
+          ls -la
+          
+      - name: Commit and push changes
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add -f architecture.png
+          git status
+          git commit -m "Update architecture diagram [skip ci]" || echo "No changes to commit"
+          git push || echo "No changes to push"
diff --git a/adalflow/adalflow/components/model_client/__init__.py b/adalflow/adalflow/components/model_client/__init__.py
index 60c7a9ba..c57ed6d6 100644
--- a/adalflow/adalflow/components/model_client/__init__.py
+++ b/adalflow/adalflow/components/model_client/__init__.py
@@ -60,6 +60,10 @@
     "adalflow.components.model_client.openai_client.get_probabilities",
     OptionalPackages.OPENAI,
 )
+LMStudioClient = LazyImport(
+    "adalflow.components.model_client.lm_studio_client.LMStudioClient",
+    OptionalPackages.LMSTUDIO,
+)
 
 
 __all__ = [
@@ -72,6 +76,7 @@
     "GroqAPIClient",
     "OpenAIClient",
     "GoogleGenAIClient",
+    "LMStudioClient",
 ]
 
 for name in __all__:
diff --git a/adalflow/adalflow/components/model_client/lm_studio_client.py b/adalflow/adalflow/components/model_client/lm_studio_client.py
new file mode 100644
index 00000000..81a184e3
--- /dev/null
+++ b/adalflow/adalflow/components/model_client/lm_studio_client.py
@@ -0,0 +1,120 @@
+import os
+import re
+from typing import Dict, Optional, Any, List, Union, Sequence
+import logging
+import backoff
+import requests
+from adalflow.core.types import ModelType, GeneratorOutput, EmbedderOutput, Embedding, Usage
+from adalflow.core.model_client import ModelClient
+
+log = logging.getLogger(__name__)
+
+class LMStudioClient(ModelClient):
+    """A component wrapper for the LM Studio API client."""
+
+    def __init__(self, host: Optional[str] = None, port: Optional[int] = None):
+        super().__init__()
+        self._host = host or os.getenv("LMSTUDIO_HOST", "http://localhost")
+        self._port = port or int(os.getenv("LMSTUDIO_PORT", "1234"))
+        self._base_url = f"{self._host}:{self._port}/v1"
+        self.init_sync_client()
+        self.async_client = None  # To be added
+
+    def init_sync_client(self):
+        """Create the synchronous client"""
+        self.sync_client = requests.Session()
+
+    def convert_inputs_to_api_kwargs(
+        self,
+        input: Optional[Any] = None,
+        model_kwargs: Dict = {},
+        model_type: ModelType = ModelType.UNDEFINED,
+    ) -> Dict:
+        """Convert the input and model_kwargs to api_kwargs for the LM Studio API."""
+        final_model_kwargs = model_kwargs.copy()
+        if model_type == ModelType.EMBEDDER:
+            if isinstance(input, str):
+                input = [input]
+            assert isinstance(input, Sequence), "input must be a sequence of text"
+            final_model_kwargs["input"] = input
+        elif model_type == ModelType.LLM:
+            messages = []
+            if input is not None and input != "":
+                messages.append({"role": "system", "content": "You are a helpful assistant. Provide a direct and concise answer to the user's question. Do not include any URLs or references in your response."})
+                messages.append({"role": "user", "content": input})
+            assert isinstance(messages, Sequence), "input must be a sequence of messages"
+            final_model_kwargs["messages"] = messages
+            
+            # Set default values for controlling response length if not provided
+            final_model_kwargs.setdefault("max_tokens", 50)
+            final_model_kwargs.setdefault("temperature", 0.1)
+            final_model_kwargs.setdefault("top_p", 0.9)
+            final_model_kwargs.setdefault("frequency_penalty", 0.0)
+            final_model_kwargs.setdefault("presence_penalty", 0.0)
+            final_model_kwargs.setdefault("stop", ["\n", "###", "://"])
+        else:
+            raise ValueError(f"model_type {model_type} is not supported")
+        return final_model_kwargs
+
+    @backoff.on_exception(backoff.expo, requests.RequestException, max_time=10)
+    def call(self, api_kwargs: Dict = {}, model_type: ModelType = ModelType.UNDEFINED):
+        if model_type == ModelType.EMBEDDER:
+            response = self.sync_client.post(f"{self._base_url}/embeddings", json=api_kwargs)
+        elif model_type == ModelType.LLM:
+            response = self.sync_client.post(f"{self._base_url}/chat/completions", json=api_kwargs)
+        else:
+            raise ValueError(f"model_type {model_type} is not supported")
+        
+        response.raise_for_status()
+        return response.json()
+
+    def parse_chat_completion(self, completion: Dict) -> GeneratorOutput:
+        """Parse the completion to a GeneratorOutput."""
+        if "choices" in completion and len(completion["choices"]) > 0:
+            content = completion["choices"][0]["message"]["content"]
+            
+            # Clean up the content
+            content = self._clean_response(content)
+            
+            return GeneratorOutput(data=None, raw_response=content)
+        else:
+            log.error(f"Error parsing the completion: {completion}")
+            return GeneratorOutput(data=None, error="Error parsing the completion", raw_response=completion)
+
+    def _clean_response(self, content: str) -> str:
+        """Clean up the response content."""
+        # Remove any URLs
+        content = re.sub(r'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', '', content)
+        
+        # Remove any content after "###" or "://"
+        content = re.split(r'###|://', content)[0]
+        
+        # Remove any remaining HTML-like tags
+        content = re.sub(r'<[^>]+>', '', content)
+        
+        # Remove any repeated information
+        sentences = content.split('.')
+        unique_sentences = []
+        for sentence in sentences:
+            if sentence.strip() and sentence.strip() not in unique_sentences:
+                unique_sentences.append(sentence.strip())
+        content = '. '.join(unique_sentences)
+        
+        return content.strip()
+
+    def parse_embedding_response(self, response: Dict) -> EmbedderOutput:
+        """Parse the embedding response to an EmbedderOutput."""
+        try:
+            embeddings = [Embedding(embedding=data["embedding"], index=i) for i, data in enumerate(response["data"])]
+            usage = Usage(
+                prompt_tokens=response["usage"]["prompt_tokens"],
+                total_tokens=response["usage"]["total_tokens"]
+            )
+            return EmbedderOutput(data=embeddings, model=response["model"], usage=usage)
+        except Exception as e:
+            log.error(f"Error parsing the embedding response: {e}")
+            return EmbedderOutput(data=[], error=str(e), raw_response=response)
+
+    async def acall(self, api_kwargs: Dict = {}, model_type: ModelType = ModelType.UNDEFINED):
+        """LM Studio doesn't support async calls natively, so we use the sync method."""
+        return self.call(api_kwargs, model_type)
diff --git a/architecture.png b/architecture.png
new file mode 100644
index 00000000..880b7879
Binary files /dev/null and b/architecture.png differ
diff --git a/architecture_generator.py b/architecture_generator.py
new file mode 100644
index 00000000..19f3483f
--- /dev/null
+++ b/architecture_generator.py
@@ -0,0 +1,64 @@
+from diagrams import Diagram, Cluster, Edge
+from diagrams.programming.language import Python
+from diagrams.onprem.database import PostgreSQL
+from diagrams.generic.storage import Storage
+
+def generate_architecture():
+    """Generate architecture diagram for AdalFlow project."""
+    
+    graph_attr = {
+        "fontsize": "30",
+        "bgcolor": "white",
+        "splines": "ortho",
+        "pad": "0.5"
+    }
+    
+    node_attr = {
+        "fontsize": "14"
+    }
+    
+    with Diagram(
+        "AdalFlow Architecture",
+        show=False,
+        direction="TB",
+        graph_attr=graph_attr,
+        node_attr=node_attr,
+        filename="architecture",
+        outformat="png"
+    ):
+        with Cluster("Core"):
+            core = Python("Core Engine")
+            
+        with Cluster("Data Processing"):
+            datasets = Python("Datasets")
+            optim = Python("Optimization")
+            eval_comp = Python("Evaluation")
+            
+        with Cluster("Infrastructure"):
+            database = PostgreSQL("Database")
+            tracing = Storage("Tracing")
+            
+        with Cluster("Components"):
+            components = Python("Components")
+            utils = Python("Utils")
+
+        # Core connections
+        core >> Edge(color="darkgreen") >> datasets
+        core >> Edge(color="darkgreen") >> optim
+        core >> Edge(color="darkgreen") >> eval_comp
+        core >> Edge(color="darkblue") >> components
+        
+        # Infrastructure connections
+        components >> Edge(color="red") >> database
+        datasets >> Edge(color="red") >> database
+        
+        # Tracing connections
+        optim >> Edge(color="orange") >> tracing
+        eval_comp >> Edge(color="orange") >> tracing
+        
+        # Utils connections
+        utils >> Edge(style="dotted") >> components
+        utils >> Edge(style="dotted") >> core
+
+if __name__ == "__main__":
+    generate_architecture()
\ No newline at end of file