chore: config feedback (#610)

Author: caroljung-cg

src/codegen/cli/commands/config/main.py

@@ -5,8 +5,8 @@
 from rich.table import Table
 
 from codegen.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
-from codegen.configs.session_manager import session_manager
 from codegen.configs.user_config import UserConfig
+from codegen.shared.path import get_git_root_path
 
 
 @click.group(name="config")
@@ -16,8 +16,7 @@ def config_command():
 
 
 @config_command.command(name="list")
-@click.option("--global", "is_global", is_flag=True, help="Lists the global configuration values")
-def list_command(is_global: bool):
+def list_command():
     """List current configuration values."""
 
     def flatten_dict(data: dict, prefix: str = "") -> dict:
@@ -33,7 +32,7 @@ def flatten_dict(data: dict, prefix: str = "") -> dict:
                 items[full_key] = value
         return items
 
-    config = _get_user_config(is_global)
+    config = _get_user_config()
     flat_config = flatten_dict(config.to_dict())
     sorted_items = sorted(flat_config.items(), key=lambda x: x[0])
 
@@ -82,10 +81,9 @@ def flatten_dict(data: dict, prefix: str = "") -> dict:
 
 @config_command.command(name="get")
 @click.argument("key")
-@click.option("--global", "is_global", is_flag=True, help="Get the global configuration value")
-def get_command(key: str, is_global: bool):
+def get_command(key: str):
     """Get a configuration value."""
-    config = _get_user_config(is_global)
+    config = _get_user_config()
     if not config.has_key(key):
         rich.print(f"[red]Error: Configuration key '{key}' not found[/red]")
         return
@@ -98,10 +96,9 @@ def get_command(key: str, is_global: bool):
 @config_command.command(name="set")
 @click.argument("key")
 @click.argument("value")
-@click.option("--global", "is_global", is_flag=True, help="Sets the global configuration value")
-def set_command(key: str, value: str, is_global: bool):
+def set_command(key: str, value: str):
     """Set a configuration value and write to .env"""
-    config = _get_user_config(is_global)
+    config = _get_user_config()
     if not config.has_key(key):
         rich.print(f"[red]Error: Configuration key '{key}' not found[/red]")
         return
@@ -118,10 +115,10 @@ def set_command(key: str, value: str, is_global: bool):
     rich.print(f"[green]Successfully set {key}=[magenta]{value}[/magenta] and saved to {ENV_FILENAME}[/green]")
 
 
-def _get_user_config(is_global: bool) -> UserConfig:
-    if is_global or (active_session_path := session_manager.get_active_session()) is None:
+def _get_user_config() -> UserConfig:
+    if (project_root := get_git_root_path()) is None:
         env_filepath = GLOBAL_ENV_FILE
     else:
-        env_filepath = active_session_path / ENV_FILENAME
+        env_filepath = project_root / ENV_FILENAME
 
     return UserConfig(env_filepath)

src/codegen/cli/commands/init/main.py

@@ -8,7 +8,7 @@
 from codegen.cli.commands.init.render import get_success_message
 from codegen.cli.rich.codeblocks import format_command
 from codegen.cli.workspace.initialize_workspace import initialize_codegen
-from codegen.git.utils.path import get_git_root_path
+from codegen.shared.path import get_git_root_path
 
 
 @click.command(name="init")

src/codegen/cli/env/global_env.py

@@ -38,20 +38,24 @@ def _parse_env(self) -> Environment:
     def _load_dotenv(self) -> None:
         env_file = find_dotenv(filename=f".env.{self.ENV}")
         # if env specific .env file does not exist, try to load .env
-        load_dotenv(env_file or None)
+        load_dotenv(env_file or None, override=True)
 
     def _get_env_var(self, var_name, required: bool = False) -> str:
         if self.ENV == "local":
             return ""
 
-        value = os.environ.get(var_name)
-        if value:
+        if value := os.environ.get(var_name):
             return value
+
         if required:
             msg = f"Environment variable {var_name} is not set with ENV={self.ENV}!"
             raise ValueError(msg)
         return ""
 
+    def __repr__(self) -> str:
+        # Returns all env vars in a readable format
+        return "\n".join([f"{k}={v}" for k, v in self.__dict__.items()])
+
 
 # NOTE: load and store envvars once
 global_env = GlobalEnv()

src/codegen/configs/models/base_config.py

@@ -1,11 +1,11 @@
 from abc import ABC
 from pathlib import Path
 
-from dotenv import set_key
+from dotenv import load_dotenv, set_key
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from codegen.configs.constants import ENV_FILENAME, GLOBAL_ENV_FILE
-from codegen.configs.session_manager import session_root
+from codegen.shared.path import get_git_root_path
 
 
 class BaseConfig(BaseSettings, ABC):
@@ -18,20 +18,18 @@ class BaseConfig(BaseSettings, ABC):
 
     def __init__(self, prefix: str, env_filepath: Path | None = None, *args, **kwargs) -> None:
         if env_filepath is None:
-            root_path = session_root
+            root_path = get_git_root_path()
             if root_path is not None:
                 env_filepath = root_path / ENV_FILENAME
 
         # Only include env files that exist
-        env_filepaths = []
         if GLOBAL_ENV_FILE.exists():
-            env_filepaths.append(GLOBAL_ENV_FILE)
+            load_dotenv(GLOBAL_ENV_FILE, override=True)
+
         if env_filepath and env_filepath.exists() and env_filepath != GLOBAL_ENV_FILE:
-            env_filepaths.append(env_filepath)
+            load_dotenv(env_filepath, override=True)
 
         self.model_config["env_prefix"] = f"{prefix.upper()}_" if len(prefix) > 0 else ""
-        self.model_config["env_file"] = env_filepaths
-
         super().__init__(*args, **kwargs)
 
     @property

src/codegen/configs/models/repository.py

@@ -37,6 +37,3 @@ def full_name(self) -> str | None:
         if self.owner is not None:
             return f"{self.owner}/{self.name}"
         return None
-
-
-DefaultRepoConfig = RepositoryConfig()

src/codegen/configs/models/secrets.py

@@ -14,6 +14,3 @@ def __init__(self, prefix: str = "", *args, **kwargs) -> None:
     github_token: str | None = None
     openai_api_key: str | None = None
     linear_api_key: str | None = None
-
-
-DefaultSecrets = SecretsConfig()

src/codegen/configs/session_manager.py

@@ -3,7 +3,7 @@
 import json
 from pathlib import Path
 
-from codegen.configs.constants import CODEGEN_DIR_NAME, SESSION_FILE
+from codegen.configs.constants import SESSION_FILE
 
 
 class SessionManager:
@@ -61,34 +61,4 @@ def __str__(self) -> str:
         return f"GlobalConfig:\n  Active Session: {active}\n  Sessions:\n    {sessions_str}\n  Global Session:\n    {self.session_config}"
 
 
-def _get_project_root() -> Path | None:
-    """Get the active codegen directory."""
-    active_session = session_manager.get_active_session()
-    if active_session:
-        return active_session
-
-    try:
-        path = Path.cwd().resolve()
-    except FileNotFoundError:
-        # Current directory is not accessible
-        return None
-
-    while True:
-        codegen_path = path / CODEGEN_DIR_NAME
-        git_path = path / ".git"
-
-        if codegen_path.exists():
-            return path
-        if git_path.exists():
-            return path
-
-        parent = path.parent.resolve()
-        if parent == path:  # We've reached the root directory
-            break
-        path = parent
-
-    return None
-
-
 session_manager = SessionManager()
-session_root = _get_project_root()

src/codegen/configs/user_config.py

@@ -34,13 +34,13 @@ def to_dict(self) -> dict:
         for key, value in self.repository.model_dump().items():
             config_dict[f"{self.repository.env_prefix}{key}".upper()] = value
 
-        # Add secrets configs with 'secrets_' prefix
-        for key, value in self.secrets.model_dump().items():
-            config_dict[f"{self.secrets.env_prefix}{key}".upper()] = value
-
         # Add feature flags configs with 'feature_flags_' prefix
         for key, value in self.codebase.model_dump().items():
             config_dict[f"{self.codebase.env_prefix}{key}".upper()] = value
+
+        # Add secrets configs
+        for key, value in self.secrets.model_dump().items():
+            config_dict[f"{self.secrets.env_prefix}{key}".upper()] = value
         return config_dict
 
     def has_key(self, full_key: str) -> bool:

src/codegen/extensions/lsp/protocol.py

@@ -5,7 +5,7 @@
 from lsprotocol.types import INITIALIZE, InitializeParams, InitializeResult
 from pygls.protocol import LanguageServerProtocol, lsp_method
 
-from codegen.configs.models.codebase import DefaultCodebaseConfig
+from codegen.configs.models.codebase import CodebaseConfig
 from codegen.extensions.lsp.io import LSPIO
 from codegen.extensions.lsp.progress import LSPProgress
 from codegen.extensions.lsp.utils import get_path
@@ -26,7 +26,7 @@ def _init_codebase(self, params: InitializeParams) -> None:
             root = get_path(params.root_uri)
         else:
             root = os.getcwd()
-        config = DefaultCodebaseConfig.model_copy(update={"full_range_index": True})
+        config = CodebaseConfig().model_copy(update={"full_range_index": True})
         io = LSPIO(self.workspace)
         self._server.codebase = Codebase(repo_path=str(root), config=config, io=io, progress=progress)
         self._server.progress_manager = progress

src/codegen/git/clients/git_repo_client.py

@@ -15,6 +15,7 @@
 from github.Tag import Tag
 from github.Workflow import Workflow
 
+from codegen.configs.models.secrets import SecretsConfig
 from codegen.git.clients.github_client import GithubClient
 from codegen.git.schemas.repo_config import RepoConfig
 from codegen.git.utils.format import format_comparison
@@ -29,9 +30,9 @@ class GitRepoClient:
     gh_client: GithubClient
     _repo: Repository
 
-    def __init__(self, repo_config: RepoConfig, access_token: str) -> None:
+    def __init__(self, repo_config: RepoConfig, access_token: str | None = None) -> None:
         self.repo_config = repo_config
-        self.gh_client = self._create_github_client(token=access_token)
+        self.gh_client = self._create_github_client(token=access_token or SecretsConfig().github_token)
         self._repo = self._create_client()
 
     def _create_github_client(self, token: str) -> GithubClient: