nao-core 0.0.3__tar.gz → 0.0.9__tar.gz

{nao_core-0.0.3 → nao_core-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nao-core
-Version: 0.0.3
+Version: 0.0.9
 Summary: nao Core is your analytics context builder with the best chat interface.
 Project-URL: Homepage, https://github.com/naolabs/chat
 Project-URL: Repository, https://github.com/naolabs/chat

{nao_core-0.0.3 → nao_core-0.0.9}/nao_core/__init__.py

@@ -1,3 +1,3 @@
 # nao Core CLI package
-__version__ = "0.0.3"
+__version__ = "0.0.9"
 

{nao_core-0.0.3 → nao_core-0.0.9}/nao_core/commands/chat.py

@@ -1,5 +1,4 @@
 import os
-import signal
 import subprocess
 import sys
 import webbrowser
@@ -8,6 +7,8 @@ from time import sleep
 
 from rich.console import Console
 
+from nao_core.config import NaoConfig
+
 console = Console()
 
 # Default port for the nao chat server
@@ -63,6 +64,13 @@ def chat():
 	console.print(f"[dim]Server binary: {binary_path}[/dim]")
 	console.print(f"[dim]Working directory: {bin_dir}[/dim]")
 
+	# Try to load nao config from current directory
+	config = NaoConfig.try_load()
+	if config:
+		console.print(f"[bold green]✓[/bold green] Loaded config from {Path.cwd() / 'nao_config.yaml'}")
+	else:
+		console.print("[dim]No nao_config.yaml found in current directory[/dim]")
+
 	# Start the server process
 	process = None
 	try:
@@ -70,6 +78,12 @@ def chat():
 		# so the server can find the public folder
 		env = os.environ.copy()
 
+		# Set LLM API key from config if available
+		if config and config.llm:
+			env_var_name = f"{config.llm.model.upper()}_API_KEY"
+			env[env_var_name] = config.llm.api_key
+			console.print(f"[bold green]✓[/bold green] Set {env_var_name} from config")
+
 		process = subprocess.Popen(
 			[str(binary_path)],
 			cwd=str(bin_dir),

{nao_core-0.0.3 → nao_core-0.0.9}/nao_core/commands/init.py

@@ -1,9 +1,9 @@
 from pathlib import Path
 
 from rich.console import Console
-from rich.prompt import Prompt
+from rich.prompt import Confirm, Prompt
 
-from nao_core.config import NaoConfig
+from nao_core.config import LLMConfig, LLMProvider, NaoConfig
 
 console = Console()
 
@@ -29,9 +29,37 @@ def init():
 		)
 		return
 
+	# LLM Configuration
+	llm_config = None
+	setup_llm = Confirm.ask("\n[bold]Set up LLM configuration?[/bold]", default=True)
+
+	if setup_llm:
+		console.print("\n[bold cyan]LLM Configuration[/bold cyan]\n")
+
+		provider_choices = [p.value for p in LLMProvider]
+		llm_provider = Prompt.ask(
+			"[bold]Select LLM provider[/bold]",
+			choices=provider_choices,
+			default=provider_choices[0],
+		)
+
+		api_key = Prompt.ask(
+			f"[bold]Enter your {llm_provider.upper()} API key[/bold]",
+			password=True,
+		)
+
+		if not api_key:
+			console.print("[bold red]✗[/bold red] API key cannot be empty.")
+			return
+
+		llm_config = LLMConfig(
+			model=LLMProvider(llm_provider),
+			api_key=api_key,
+		)
+
 	project_path.mkdir(parents=True)
 
-	config = NaoConfig(project_name=project_name)
+	config = NaoConfig(project_name=project_name, llm=llm_config)
 	config.save(project_path)
 
 	console.print()

nao_core-0.0.9/nao_core/config.py

@@ -0,0 +1,64 @@
+from enum import Enum
+from pathlib import Path
+
+import yaml
+from pydantic import BaseModel, Field
+
+
+class LLMProvider(str, Enum):
+	"""Supported LLM providers."""
+
+	OPENAI = "openai"
+
+
+class LLMConfig(BaseModel):
+	"""LLM configuration."""
+
+	model: LLMProvider = Field(description="The LLM provider to use")
+	api_key: str = Field(description="The API key to use")
+
+class NaoConfig(BaseModel):
+	"""nao project configuration."""
+
+	project_name: str = Field(description="The name of the nao project")
+	llm: LLMConfig | None = Field(default=None, description="The LLM configuration")
+
+	
+	def save(self, path: Path) -> None:
+		"""Save the configuration to a YAML file."""
+		config_file = path / "nao_config.yaml"
+		with config_file.open("w") as f:
+			yaml.dump(
+				self.model_dump(mode="json"),
+				f,
+				default_flow_style=False,
+				sort_keys=False,
+				allow_unicode=True,
+			)
+
+	@classmethod
+	def load(cls, path: Path) -> "NaoConfig":
+		"""Load the configuration from a YAML file."""
+		config_file = path / "nao_config.yaml"
+		with config_file.open() as f:
+			data = yaml.safe_load(f)
+		return cls.model_validate(data)
+
+	@classmethod
+	def try_load(cls, path: Path | None = None) -> "NaoConfig | None":
+		"""Try to load config from path, returns None if not found or invalid.
+		
+		Args:
+			path: Directory containing nao_config.yaml. Defaults to current directory.
+		"""
+		if path is None:
+			path = Path.cwd()
+		try:
+			return cls.load(path)
+		except (FileNotFoundError, ValueError, yaml.YAMLError):
+			return None
+
+	@classmethod
+	def json_schema(cls) -> dict:
+		"""Generate JSON schema for the configuration."""
+		return cls.model_json_schema()

{nao_core-0.0.3 → nao_core-0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nao-core"
-version = "0.0.3"
+version = "0.0.9"
 description = "nao Core is your analytics context builder with the best chat interface."
 readme = "README.md"
 requires-python = ">=3.10"

nao_core-0.0.3/nao_core/config.py

@@ -1,35 +0,0 @@
-from pathlib import Path
-
-import yaml
-from pydantic import BaseModel, Field
-
-
-class NaoConfig(BaseModel):
-	"""nao project configuration."""
-
-	project_name: str = Field(description="The name of the nao project")
-
-	def save(self, path: Path) -> None:
-		"""Save the configuration to a YAML file."""
-		config_file = path / "nao_config.yaml"
-		with config_file.open("w") as f:
-			yaml.dump(
-				self.model_dump(),
-				f,
-				default_flow_style=False,
-				sort_keys=False,
-				allow_unicode=True,
-			)
-
-	@classmethod
-	def load(cls, path: Path) -> "NaoConfig":
-		"""Load the configuration from a YAML file."""
-		config_file = path / "nao_config.yaml"
-		with config_file.open() as f:
-			data = yaml.safe_load(f)
-		return cls.model_validate(data)
-
-	@classmethod
-	def json_schema(cls) -> dict:
-		"""Generate JSON schema for the configuration."""
-		return cls.model_json_schema()