Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ebfcfb969a | |||
| 56b05eb686 | |||
| 59a7e9787e | |||
| a357a307a7 | |||
| af4247e657 | |||
| 227ad1ad6f |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
sqlite.db
|
||||
sqlite.db
|
||||
.nicegui/
|
||||
16
HISTORY.md
16
HISTORY.md
@@ -4,6 +4,22 @@ Changelog
|
||||
|
||||
(unreleased)
|
||||
------------
|
||||
- Feat(api): expose database target in health refs NOISSUE. [Simon
|
||||
Diesenreiter]
|
||||
- Fix(db): prefer postgres config in production refs NOISSUE. [Simon
|
||||
Diesenreiter]
|
||||
|
||||
|
||||
0.5.0 (2026-04-10)
|
||||
------------------
|
||||
- Feat(dashboard): expose repository urls refs NOISSUE. [Simon
|
||||
Diesenreiter]
|
||||
- Feat(factory): serve dashboard at root and create project repos refs
|
||||
NOISSUE. [Simon Diesenreiter]
|
||||
|
||||
|
||||
0.4.1 (2026-04-10)
|
||||
------------------
|
||||
- Fix(ci): pin docker api version for release builds refs NOISSUE.
|
||||
[Simon Diesenreiter]
|
||||
|
||||
|
||||
23
README.md
23
README.md
@@ -6,7 +6,7 @@ Automated software generation service powered by Ollama LLM. This service allows
|
||||
|
||||
- **Telegram Integration**: Receive software requests via Telegram bot
|
||||
- **Ollama LLM**: Uses Ollama-hosted models for code generation
|
||||
- **Git Integration**: Automatically commits code to gitea
|
||||
- **Git Integration**: Creates a dedicated Gitea repository per generated project inside your organization
|
||||
- **Pull Requests**: Creates PRs for user review before merging
|
||||
- **Web UI**: Beautiful dashboard for monitoring project progress
|
||||
- **n8n Workflows**: Bridges Telegram with LLMs via n8n webhooks
|
||||
@@ -49,9 +49,19 @@ OLLAMA_MODEL=llama3
|
||||
|
||||
# Gitea
|
||||
GITEA_URL=https://gitea.yourserver.com
|
||||
GITEA_TOKEN= analyze your_gitea_api_token
|
||||
GITEA_TOKEN=your_gitea_api_token
|
||||
GITEA_OWNER=ai-software-factory
|
||||
GITEA_REPO=ai-software-factory
|
||||
# Optional legacy fixed-repository mode. Leave empty to create one repo per project.
|
||||
GITEA_REPO=
|
||||
|
||||
# Database
|
||||
# In production, provide PostgreSQL settings. They take precedence over the SQLite default.
|
||||
# Setting USE_SQLITE=false is still supported if you want to make the choice explicit.
|
||||
POSTGRES_HOST=postgres.yourserver.com
|
||||
POSTGRES_PORT=5432
|
||||
POSTGRES_USER=ai_software_factory
|
||||
POSTGRES_PASSWORD=change-me
|
||||
POSTGRES_DB=ai_software_factory
|
||||
|
||||
# n8n
|
||||
N8N_WEBHOOK_URL=http://n8n.yourserver.com/webhook/telegram
|
||||
@@ -83,17 +93,20 @@ docker-compose up -d
|
||||
|
||||
2. **Monitor progress via Web UI:**
|
||||
|
||||
Open `http://yourserver:8000` to see real-time progress
|
||||
Open `http://yourserver:8000/` to see the dashboard and `http://yourserver:8000/api` for API metadata
|
||||
|
||||
3. **Review PRs in Gitea:**
|
||||
|
||||
Check your gitea repository for generated PRs
|
||||
|
||||
If you deploy the container with PostgreSQL environment variables set, the service now selects PostgreSQL automatically even though SQLite remains the default for local/test usage.
|
||||
|
||||
## API Endpoints
|
||||
|
||||
| Endpoint | Method | Description |
|
||||
|------|------|-------|
|
||||
| `/` | GET | API information |
|
||||
| `/` | GET | Dashboard |
|
||||
| `/api` | GET | API information |
|
||||
| `/health` | GET | Health check |
|
||||
| `/generate` | POST | Generate new software |
|
||||
| `/status/{project_id}` | GET | Get project status |
|
||||
|
||||
@@ -15,7 +15,7 @@ OLLAMA_MODEL=llama3
|
||||
GITEA_URL=https://gitea.yourserver.com
|
||||
GITEA_TOKEN=your_gitea_api_token
|
||||
GITEA_OWNER=your_organization_name
|
||||
GITEA_REPO= (optional - leave empty for any repo, or specify a default)
|
||||
GITEA_REPO= (optional legacy fixed repository mode; leave empty to create one repo per project)
|
||||
|
||||
# n8n
|
||||
# n8n webhook for Telegram integration
|
||||
@@ -30,6 +30,8 @@ TELEGRAM_BOT_TOKEN=your_telegram_bot_token
|
||||
TELEGRAM_CHAT_ID=your_chat_id
|
||||
|
||||
# PostgreSQL
|
||||
# In production, provide PostgreSQL settings below. They now take precedence over the SQLite default.
|
||||
# You can also set USE_SQLITE=false explicitly if you want the intent to be obvious.
|
||||
POSTGRES_HOST=postgres
|
||||
POSTGRES_PORT=5432
|
||||
POSTGRES_USER=ai_test
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.4.1
|
||||
0.6.0
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
"""AI Software Factory agents."""
|
||||
|
||||
from agents.orchestrator import AgentOrchestrator
|
||||
from agents.git_manager import GitManager
|
||||
from agents.ui_manager import UIManager
|
||||
from agents.telegram import TelegramHandler
|
||||
from agents.gitea import GiteaAPI
|
||||
from agents.database_manager import DatabaseManager
|
||||
from .orchestrator import AgentOrchestrator
|
||||
from .git_manager import GitManager
|
||||
from .ui_manager import UIManager
|
||||
from .telegram import TelegramHandler
|
||||
from .gitea import GiteaAPI
|
||||
from .database_manager import DatabaseManager
|
||||
|
||||
__all__ = [
|
||||
"AgentOrchestrator",
|
||||
|
||||
@@ -4,6 +4,7 @@ from sqlalchemy.orm import Session
|
||||
from sqlalchemy import text
|
||||
|
||||
try:
|
||||
from ..config import settings
|
||||
from ..models import (
|
||||
AuditTrail,
|
||||
ProjectHistory,
|
||||
@@ -17,6 +18,7 @@ try:
|
||||
UserAction,
|
||||
)
|
||||
except ImportError:
|
||||
from config import settings
|
||||
from models import (
|
||||
AuditTrail,
|
||||
ProjectHistory,
|
||||
@@ -307,6 +309,31 @@ class DatabaseManager:
|
||||
self.db.refresh(pr)
|
||||
return pr
|
||||
|
||||
def _get_latest_ui_snapshot_data(self, history_id: int) -> dict:
|
||||
"""Return the latest stored UI snapshot payload for a project."""
|
||||
snapshot = self.db.query(UISnapshot).filter(
|
||||
UISnapshot.history_id == history_id
|
||||
).order_by(UISnapshot.created_at.desc(), UISnapshot.id.desc()).first()
|
||||
if not snapshot:
|
||||
return {}
|
||||
return self._normalize_metadata(snapshot.snapshot_data)
|
||||
|
||||
def _get_project_repository(self, history: ProjectHistory) -> dict | None:
|
||||
"""Resolve repository metadata for a project."""
|
||||
snapshot_data = self._get_latest_ui_snapshot_data(history.id)
|
||||
repository = snapshot_data.get("repository")
|
||||
if isinstance(repository, dict) and any(repository.values()):
|
||||
return repository
|
||||
|
||||
if settings.gitea_owner and settings.gitea_repo and settings.gitea_url:
|
||||
return {
|
||||
"owner": settings.gitea_owner,
|
||||
"name": settings.gitea_repo,
|
||||
"url": f"{settings.gitea_url.rstrip('/')}/{settings.gitea_owner}/{settings.gitea_repo}",
|
||||
"mode": "shared",
|
||||
}
|
||||
return None
|
||||
|
||||
def get_project_by_id(self, project_id: str) -> ProjectHistory | None:
|
||||
"""Get project by ID."""
|
||||
return self.db.query(ProjectHistory).filter(ProjectHistory.project_id == project_id).first()
|
||||
@@ -708,6 +735,7 @@ class DatabaseManager:
|
||||
prompts = self.get_prompt_events(project_id=project_id)
|
||||
code_changes = self.get_code_changes(project_id=project_id)
|
||||
correlations = self.get_prompt_change_correlations(project_id=project_id)
|
||||
repository = self._get_project_repository(history)
|
||||
|
||||
return {
|
||||
"project": {
|
||||
@@ -720,6 +748,7 @@ class DatabaseManager:
|
||||
"message": history.message,
|
||||
"error_message": history.error_message,
|
||||
"current_step": history.current_step,
|
||||
"repository": repository,
|
||||
"completed_at": history.completed_at.isoformat() if history.completed_at else None,
|
||||
"created_at": history.started_at.isoformat() if history.started_at else None
|
||||
},
|
||||
@@ -759,6 +788,7 @@ class DatabaseManager:
|
||||
"prompts": prompts,
|
||||
"code_changes": code_changes,
|
||||
"prompt_change_correlations": correlations,
|
||||
"repository": repository,
|
||||
}
|
||||
|
||||
def get_prompt_events(self, project_id: str | None = None, limit: int = 100) -> list[dict]:
|
||||
@@ -840,6 +870,13 @@ class DatabaseManager:
|
||||
}
|
||||
|
||||
def cleanup_audit_trail(self) -> None:
|
||||
"""Clear all audit trail entries."""
|
||||
"""Clear audit-related test data across all related tables."""
|
||||
self.db.query(PromptCodeLink).delete()
|
||||
self.db.query(PullRequest).delete()
|
||||
self.db.query(UISnapshot).delete()
|
||||
self.db.query(UserAction).delete()
|
||||
self.db.query(ProjectLog).delete()
|
||||
self.db.query(AuditTrail).delete()
|
||||
self.db.query(SystemLog).delete()
|
||||
self.db.query(ProjectHistory).delete()
|
||||
self.db.commit()
|
||||
@@ -1,12 +1,11 @@
|
||||
"""Gitea API integration for commits and PRs."""
|
||||
"""Gitea API integration for repository and pull request operations."""
|
||||
|
||||
import os
|
||||
from typing import Optional
|
||||
|
||||
|
||||
class GiteaAPI:
|
||||
"""Gitea API client for repository operations."""
|
||||
|
||||
|
||||
def __init__(self, token: str, base_url: str, owner: str | None = None, repo: str | None = None):
|
||||
self.token = token
|
||||
self.base_url = base_url.rstrip("/")
|
||||
@@ -14,69 +13,100 @@ class GiteaAPI:
|
||||
self.repo = repo
|
||||
self.headers = {
|
||||
"Authorization": f"token {token}",
|
||||
"Content-Type": "application/json"
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
|
||||
def get_config(self) -> dict:
|
||||
"""Load configuration from environment."""
|
||||
base_url = os.getenv("GITEA_URL", "https://gitea.local")
|
||||
token = os.getenv("GITEA_TOKEN", "")
|
||||
owner = os.getenv("GITEA_OWNER", "ai-test")
|
||||
repo = os.getenv("GITEA_REPO", "")
|
||||
|
||||
# Allow empty repo for any repo mode (org/repo pattern)
|
||||
if not repo:
|
||||
repo = "any-repo" # Use this as a placeholder for org/repo operations
|
||||
|
||||
# Check for repo suffix pattern (e.g., repo-* for multiple repos)
|
||||
repo_suffix = os.getenv("GITEA_REPO_SUFFIX", "")
|
||||
|
||||
return {
|
||||
"base_url": base_url.rstrip("/"),
|
||||
"token": token,
|
||||
"owner": owner,
|
||||
"repo": repo,
|
||||
"repo_suffix": repo_suffix,
|
||||
"supports_any_repo": not repo or repo_suffix
|
||||
"supports_project_repos": not bool(repo),
|
||||
}
|
||||
|
||||
|
||||
def get_auth_headers(self) -> dict:
|
||||
"""Get authentication headers."""
|
||||
return {
|
||||
"Authorization": f"token {self.token}",
|
||||
"Content-Type": "application/json"
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
async def create_branch(self, branch: str, base: str = "main", owner: str | None = None, repo: str | None = None):
|
||||
"""Create a new branch.
|
||||
|
||||
Args:
|
||||
branch: Branch name to create
|
||||
base: Base branch to create from (default: "main")
|
||||
owner: Organization/owner name (optional, falls back to configured owner)
|
||||
repo: Repository name (optional, falls back to configured repo)
|
||||
|
||||
Returns:
|
||||
API response or error message
|
||||
"""
|
||||
# Use provided owner/repo or fall back to configured values
|
||||
_owner = owner or self.owner
|
||||
_repo = repo or self.repo
|
||||
|
||||
url = f"{self.base_url}/repos/{_owner}/{_repo}/branches/{branch}"
|
||||
payload = {"base": base}
|
||||
|
||||
|
||||
def _api_url(self, path: str) -> str:
|
||||
"""Build a Gitea API URL from a relative path."""
|
||||
return f"{self.base_url}/api/v1/{path.lstrip('/')}"
|
||||
|
||||
async def _request(self, method: str, path: str, payload: dict | None = None) -> dict:
|
||||
"""Perform a Gitea API request and normalize the response."""
|
||||
try:
|
||||
import aiohttp
|
||||
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.post(url, headers=self.get_auth_headers(), json=payload) as resp:
|
||||
if resp.status == 201:
|
||||
async with session.request(
|
||||
method,
|
||||
self._api_url(path),
|
||||
headers=self.get_auth_headers(),
|
||||
json=payload,
|
||||
) as resp:
|
||||
if resp.status in (200, 201):
|
||||
return await resp.json()
|
||||
else:
|
||||
return {"error": await resp.text()}
|
||||
return {"error": await resp.text(), "status_code": resp.status}
|
||||
except Exception as e:
|
||||
return {"error": str(e)}
|
||||
|
||||
|
||||
def build_project_repo_name(self, project_id: str, project_name: str | None = None) -> str:
|
||||
"""Build a repository name for a generated project."""
|
||||
preferred = (project_name or project_id or "project").strip().lower().replace(" ", "-")
|
||||
sanitized = "".join(ch if ch.isalnum() or ch in {"-", "_"} else "-" for ch in preferred)
|
||||
while "--" in sanitized:
|
||||
sanitized = sanitized.replace("--", "-")
|
||||
return sanitized.strip("-") or project_id
|
||||
|
||||
async def create_repo(
|
||||
self,
|
||||
repo_name: str,
|
||||
owner: str | None = None,
|
||||
description: str | None = None,
|
||||
private: bool = False,
|
||||
auto_init: bool = True,
|
||||
) -> dict:
|
||||
"""Create a repository inside the configured organization."""
|
||||
_owner = owner or self.owner
|
||||
if not _owner:
|
||||
return {"error": "Owner or organization is required"}
|
||||
|
||||
payload = {
|
||||
"name": repo_name,
|
||||
"description": description or f"AI-generated project repository for {repo_name}",
|
||||
"private": private,
|
||||
"auto_init": auto_init,
|
||||
"default_branch": "main",
|
||||
}
|
||||
result = await self._request("POST", f"orgs/{_owner}/repos", payload)
|
||||
if result.get("status_code") == 409:
|
||||
existing = await self.get_repo_info(owner=_owner, repo=repo_name)
|
||||
if not existing.get("error"):
|
||||
existing["status"] = "exists"
|
||||
return existing
|
||||
if not result.get("error"):
|
||||
result.setdefault("status", "created")
|
||||
return result
|
||||
|
||||
async def create_branch(self, branch: str, base: str = "main", owner: str | None = None, repo: str | None = None):
|
||||
"""Create a new branch."""
|
||||
_owner = owner or self.owner
|
||||
_repo = repo or self.repo
|
||||
return await self._request(
|
||||
"POST",
|
||||
f"repos/{_owner}/{_repo}/branches",
|
||||
{"new_branch_name": branch, "old_ref_name": base},
|
||||
)
|
||||
|
||||
async def create_pull_request(
|
||||
self,
|
||||
title: str,
|
||||
@@ -84,107 +114,50 @@ class GiteaAPI:
|
||||
owner: str,
|
||||
repo: str,
|
||||
base: str = "main",
|
||||
head: str | None = None
|
||||
head: str | None = None,
|
||||
) -> dict:
|
||||
"""Create a pull request.
|
||||
|
||||
Args:
|
||||
title: PR title
|
||||
body: PR description
|
||||
owner: Organization/owner name
|
||||
repo: Repository name
|
||||
base: Base branch (default: "main")
|
||||
head: Head branch (optional, auto-generated if not provided)
|
||||
|
||||
Returns:
|
||||
API response or error message
|
||||
"""
|
||||
"""Create a pull request."""
|
||||
_owner = owner or self.owner
|
||||
_repo = repo or self.repo
|
||||
|
||||
url = f"{self.base_url}/repos/{_owner}/{_repo}/pulls"
|
||||
|
||||
payload = {
|
||||
"title": title,
|
||||
"body": body,
|
||||
"base": {"branch": base},
|
||||
"head": head or f"{_owner}-{_repo}-ai-gen-{hash(title) % 10000}"
|
||||
"base": base,
|
||||
"head": head or f"{_owner}-{_repo}-ai-gen-{hash(title) % 10000}",
|
||||
}
|
||||
|
||||
try:
|
||||
import aiohttp
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.post(url, headers=self.get_auth_headers(), json=payload) as resp:
|
||||
if resp.status == 201:
|
||||
return await resp.json()
|
||||
else:
|
||||
return {"error": await resp.text()}
|
||||
except Exception as e:
|
||||
return {"error": str(e)}
|
||||
|
||||
return await self._request("POST", f"repos/{_owner}/{_repo}/pulls", payload)
|
||||
|
||||
async def push_commit(
|
||||
self,
|
||||
branch: str,
|
||||
files: list[dict],
|
||||
message: str,
|
||||
owner: str | None = None,
|
||||
repo: str | None = None
|
||||
repo: str | None = None,
|
||||
) -> dict:
|
||||
"""
|
||||
Push files to a branch.
|
||||
|
||||
"""Push files to a branch.
|
||||
|
||||
In production, this would use gitea's API or git push.
|
||||
For now, we'll simulate the operation.
|
||||
|
||||
Args:
|
||||
branch: Branch name
|
||||
files: List of files to push
|
||||
message: Commit message
|
||||
owner: Organization/owner name (optional, falls back to configured owner)
|
||||
repo: Repository name (optional, falls back to configured repo)
|
||||
|
||||
Returns:
|
||||
Status response
|
||||
For now, this remains simulated.
|
||||
"""
|
||||
# Use provided owner/repo or fall back to configured values
|
||||
_owner = owner or self.owner
|
||||
_repo = repo or self.repo
|
||||
|
||||
|
||||
return {
|
||||
"status": "simulated",
|
||||
"branch": branch,
|
||||
"message": message,
|
||||
"files": files,
|
||||
"owner": _owner,
|
||||
"repo": _repo
|
||||
"repo": _repo,
|
||||
}
|
||||
|
||||
|
||||
async def get_repo_info(self, owner: str | None = None, repo: str | None = None) -> dict:
|
||||
"""Get repository information.
|
||||
|
||||
Args:
|
||||
owner: Organization/owner name (optional, falls back to configured owner)
|
||||
repo: Repository name (optional, falls back to configured repo)
|
||||
|
||||
Returns:
|
||||
Repository info or error message
|
||||
"""
|
||||
# Use provided owner/repo or fall back to configured values
|
||||
"""Get repository information."""
|
||||
_owner = owner or self.owner
|
||||
_repo = repo or self.repo
|
||||
|
||||
|
||||
if not _repo:
|
||||
return {"error": "Repository name required for org operations"}
|
||||
|
||||
url = f"{self.base_url}/repos/{_owner}/{_repo}"
|
||||
|
||||
try:
|
||||
import aiohttp
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(url, headers=self.get_auth_headers()) as resp:
|
||||
if resp.status == 200:
|
||||
return await resp.json()
|
||||
else:
|
||||
return {"error": await resp.text()}
|
||||
except Exception as e:
|
||||
return {"error": str(e)}
|
||||
|
||||
return await self._request("GET", f"repos/{_owner}/{_repo}")
|
||||
@@ -3,7 +3,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import py_compile
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from datetime import datetime
|
||||
|
||||
@@ -51,18 +50,21 @@ class AgentOrchestrator:
|
||||
self.prompt_text = prompt_text
|
||||
self.prompt_actor = prompt_actor
|
||||
self.changed_files: list[str] = []
|
||||
self.project_root = settings.projects_root / project_id
|
||||
self.prompt_audit = None
|
||||
|
||||
# Initialize agents
|
||||
self.git_manager = GitManager(project_id)
|
||||
self.ui_manager = UIManager(project_id)
|
||||
self.gitea_api = GiteaAPI(
|
||||
token=settings.GITEA_TOKEN,
|
||||
base_url=settings.GITEA_URL,
|
||||
owner=settings.GITEA_OWNER,
|
||||
repo=settings.GITEA_REPO or ""
|
||||
)
|
||||
self.project_root = settings.projects_root / project_id
|
||||
self.prompt_audit = None
|
||||
self.repo_name = settings.gitea_repo or self.gitea_api.build_project_repo_name(project_id, project_name)
|
||||
self.repo_owner = settings.gitea_owner
|
||||
self.repo_url = self._build_repo_url(self.repo_owner, self.repo_name)
|
||||
|
||||
# Initialize agents
|
||||
self.git_manager = GitManager(project_id)
|
||||
self.ui_manager = UIManager(project_id)
|
||||
|
||||
# Initialize database manager if db session provided
|
||||
self.db_manager = None
|
||||
@@ -90,6 +92,53 @@ class AgentOrchestrator:
|
||||
self.ui_manager.ui_data["project_root"] = str(self.project_root)
|
||||
self.ui_manager.ui_data["features"] = list(self.features)
|
||||
self.ui_manager.ui_data["tech_stack"] = list(self.tech_stack)
|
||||
self.ui_manager.ui_data["repository"] = {
|
||||
"owner": self.repo_owner,
|
||||
"name": self.repo_name,
|
||||
"url": self.repo_url,
|
||||
"mode": "project" if settings.use_project_repositories else "shared",
|
||||
}
|
||||
|
||||
def _build_repo_url(self, owner: str | None, repo: str | None) -> str | None:
|
||||
if not owner or not repo or not settings.gitea_url:
|
||||
return None
|
||||
return f"{settings.gitea_url.rstrip('/')}/{owner}/{repo}"
|
||||
|
||||
async def _ensure_remote_repository(self) -> None:
|
||||
if not settings.use_project_repositories:
|
||||
return
|
||||
if not self.repo_owner or not settings.gitea_token or not settings.gitea_url:
|
||||
return
|
||||
|
||||
repo_name = self.repo_name
|
||||
result = await self.gitea_api.create_repo(
|
||||
repo_name=repo_name,
|
||||
owner=self.repo_owner,
|
||||
description=f"AI-generated project for {self.project_name}",
|
||||
)
|
||||
if result.get("status") == "exists" and repo_name == self.gitea_api.build_project_repo_name(self.project_id, self.project_name):
|
||||
repo_name = f"{repo_name}-{self.project_id.split('-')[-1]}"
|
||||
result = await self.gitea_api.create_repo(
|
||||
repo_name=repo_name,
|
||||
owner=self.repo_owner,
|
||||
description=f"AI-generated project for {self.project_name}",
|
||||
)
|
||||
self.repo_name = repo_name
|
||||
self.ui_manager.ui_data["repository"]["name"] = repo_name
|
||||
if self.db_manager:
|
||||
self.db_manager.log_system_event(
|
||||
component="gitea",
|
||||
level="ERROR" if result.get("error") else "INFO",
|
||||
message=(
|
||||
f"Repository setup failed for {self.repo_owner}/{self.repo_name}: {result.get('error')}"
|
||||
if result.get("error")
|
||||
else f"Prepared repository {self.repo_owner}/{self.repo_name}"
|
||||
),
|
||||
)
|
||||
self.ui_manager.ui_data["repository"]["status"] = result.get("status", "error" if result.get("error") else "ready")
|
||||
if result.get("html_url"):
|
||||
self.repo_url = result["html_url"]
|
||||
self.ui_manager.ui_data["repository"]["url"] = self.repo_url
|
||||
|
||||
def _append_log(self, message: str) -> None:
|
||||
timestamped = f"[{datetime.utcnow().isoformat()}] {message}"
|
||||
@@ -165,6 +214,8 @@ class AgentOrchestrator:
|
||||
self._update_progress(5, "initializing", "Setting up project structure...")
|
||||
self._append_log("Initializing project.")
|
||||
|
||||
await self._ensure_remote_repository()
|
||||
|
||||
# Step 2: Create project structure (skip git operations)
|
||||
self._update_progress(20, "project-structure", "Creating project files...")
|
||||
await self._create_project_structure()
|
||||
@@ -201,6 +252,7 @@ class AgentOrchestrator:
|
||||
"history_id": self.history.id if self.history else None,
|
||||
"project_root": str(self.project_root),
|
||||
"changed_files": list(dict.fromkeys(self.changed_files)),
|
||||
"repository": self.ui_manager.ui_data.get("repository"),
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
@@ -226,6 +278,7 @@ class AgentOrchestrator:
|
||||
"history_id": self.history.id if self.history else None,
|
||||
"project_root": str(self.project_root),
|
||||
"changed_files": list(dict.fromkeys(self.changed_files)),
|
||||
"repository": self.ui_manager.ui_data.get("repository"),
|
||||
}
|
||||
|
||||
async def _create_project_structure(self) -> None:
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
[alembic]
|
||||
script_location = alembic
|
||||
prepend_sys_path = .
|
||||
path_separator = os
|
||||
sqlalchemy.url = sqlite:////tmp/ai_software_factory_test.db
|
||||
|
||||
[loggers]
|
||||
|
||||
@@ -4,12 +4,18 @@ import os
|
||||
from typing import Optional
|
||||
from pathlib import Path
|
||||
from pydantic import Field
|
||||
from pydantic_settings import BaseSettings
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
|
||||
class Settings(BaseSettings):
|
||||
"""Application settings loaded from environment variables."""
|
||||
|
||||
model_config = SettingsConfigDict(
|
||||
env_file=".env",
|
||||
env_file_encoding="utf-8",
|
||||
extra="ignore",
|
||||
)
|
||||
|
||||
# Server settings
|
||||
HOST: str = "0.0.0.0"
|
||||
PORT: int = 8000
|
||||
@@ -23,7 +29,7 @@ class Settings(BaseSettings):
|
||||
GITEA_URL: str = "https://gitea.yourserver.com"
|
||||
GITEA_TOKEN: str = ""
|
||||
GITEA_OWNER: str = "ai-software-factory"
|
||||
GITEA_REPO: str = "ai-software-factory"
|
||||
GITEA_REPO: str = ""
|
||||
|
||||
# n8n settings
|
||||
N8N_WEBHOOK_URL: str = ""
|
||||
@@ -60,6 +66,32 @@ class Settings(BaseSettings):
|
||||
DB_POOL_RECYCLE: int = 3600
|
||||
DB_POOL_TIMEOUT: int = 30
|
||||
|
||||
@property
|
||||
def postgres_url(self) -> str:
|
||||
"""Get PostgreSQL URL with trimmed whitespace."""
|
||||
return (self.POSTGRES_URL or "").strip()
|
||||
|
||||
@property
|
||||
def postgres_env_configured(self) -> bool:
|
||||
"""Whether PostgreSQL was explicitly configured via environment variables."""
|
||||
if self.postgres_url:
|
||||
return True
|
||||
postgres_env_keys = (
|
||||
"POSTGRES_HOST",
|
||||
"POSTGRES_PORT",
|
||||
"POSTGRES_USER",
|
||||
"POSTGRES_PASSWORD",
|
||||
"POSTGRES_DB",
|
||||
)
|
||||
return any(bool(os.environ.get(key, "").strip()) for key in postgres_env_keys)
|
||||
|
||||
@property
|
||||
def use_sqlite(self) -> bool:
|
||||
"""Whether SQLite should be used as the active database backend."""
|
||||
if not self.USE_SQLITE:
|
||||
return False
|
||||
return not self.postgres_env_configured
|
||||
|
||||
@property
|
||||
def pool(self) -> dict:
|
||||
"""Get database pool configuration."""
|
||||
@@ -73,8 +105,10 @@ class Settings(BaseSettings):
|
||||
@property
|
||||
def database_url(self) -> str:
|
||||
"""Get database connection URL."""
|
||||
if self.USE_SQLITE:
|
||||
if self.use_sqlite:
|
||||
return f"sqlite:///{self.SQLITE_DB_PATH}"
|
||||
if self.postgres_url:
|
||||
return self.postgres_url
|
||||
return (
|
||||
f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}"
|
||||
f"@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DB}"
|
||||
@@ -83,8 +117,10 @@ class Settings(BaseSettings):
|
||||
@property
|
||||
def test_database_url(self) -> str:
|
||||
"""Get test database connection URL."""
|
||||
if self.USE_SQLITE:
|
||||
if self.use_sqlite:
|
||||
return f"sqlite:///{self.SQLITE_DB_PATH}"
|
||||
if self.postgres_url:
|
||||
return self.postgres_url
|
||||
return (
|
||||
f"postgresql://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}"
|
||||
f"@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_TEST_DB}"
|
||||
@@ -105,6 +141,21 @@ class Settings(BaseSettings):
|
||||
"""Get Gitea token with trimmed whitespace."""
|
||||
return self.GITEA_TOKEN.strip()
|
||||
|
||||
@property
|
||||
def gitea_owner(self) -> str:
|
||||
"""Get Gitea owner/organization with trimmed whitespace."""
|
||||
return self.GITEA_OWNER.strip()
|
||||
|
||||
@property
|
||||
def gitea_repo(self) -> str:
|
||||
"""Get the optional fixed Gitea repository name with trimmed whitespace."""
|
||||
return self.GITEA_REPO.strip()
|
||||
|
||||
@property
|
||||
def use_project_repositories(self) -> bool:
|
||||
"""Whether the service should create one repository per generated project."""
|
||||
return not bool(self.gitea_repo)
|
||||
|
||||
@property
|
||||
def n8n_webhook_url(self) -> str:
|
||||
"""Get n8n webhook URL with trimmed whitespace."""
|
||||
@@ -177,11 +228,5 @@ class Settings(BaseSettings):
|
||||
"""Get test PostgreSQL database name."""
|
||||
return self.POSTGRES_TEST_DB.strip()
|
||||
|
||||
class Config:
|
||||
env_file = ".env"
|
||||
env_file_encoding = "utf-8"
|
||||
extra = "ignore"
|
||||
|
||||
|
||||
# Create instance for module-level access
|
||||
settings = Settings()
|
||||
@@ -27,6 +27,30 @@ def _resolve_n8n_api_url() -> str:
|
||||
return ''
|
||||
|
||||
|
||||
def _render_repository_block(repository: dict | None) -> None:
|
||||
"""Render repository details and URL when available."""
|
||||
if not repository:
|
||||
ui.label('Repository URL not available yet.').classes('factory-muted')
|
||||
return
|
||||
|
||||
owner = repository.get('owner') or 'unknown-owner'
|
||||
name = repository.get('name') or 'unknown-repo'
|
||||
mode = repository.get('mode') or 'project'
|
||||
status = repository.get('status')
|
||||
repo_url = repository.get('url')
|
||||
|
||||
with ui.column().classes('gap-1'):
|
||||
with ui.row().classes('items-center gap-2'):
|
||||
ui.label(f'{owner}/{name}').style('font-weight: 700; color: #2f241d;')
|
||||
ui.label(mode).classes('factory-chip')
|
||||
if status:
|
||||
ui.label(status).classes('factory-chip')
|
||||
if repo_url:
|
||||
ui.link(repo_url, repo_url, new_tab=True).classes('factory-code')
|
||||
else:
|
||||
ui.label('Repository URL not available yet.').classes('factory-muted')
|
||||
|
||||
|
||||
def _load_dashboard_snapshot() -> dict:
|
||||
"""Load dashboard data from the database."""
|
||||
db = get_db_sync()
|
||||
@@ -101,6 +125,14 @@ def create_dashboard():
|
||||
projects = snapshot['projects']
|
||||
correlations = snapshot['correlations']
|
||||
system_logs = snapshot['system_logs']
|
||||
project_repository_map = {
|
||||
project_bundle['project']['project_id']: {
|
||||
'project_name': project_bundle['project']['project_name'],
|
||||
'repository': project_bundle.get('repository') or project_bundle['project'].get('repository'),
|
||||
}
|
||||
for project_bundle in projects
|
||||
if project_bundle.get('project')
|
||||
}
|
||||
|
||||
with ui.column().classes('factory-shell w-full gap-4 q-pa-lg'):
|
||||
with ui.card().classes('factory-panel w-full q-pa-lg'):
|
||||
@@ -171,6 +203,10 @@ def create_dashboard():
|
||||
project = project_bundle['project']
|
||||
with ui.expansion(f"{project['project_name']} · {project['status']}", icon='folder').classes('factory-panel w-full q-mb-md'):
|
||||
with ui.grid(columns=2).classes('w-full gap-4 q-pa-md'):
|
||||
with ui.card().classes('q-pa-md'):
|
||||
ui.label('Repository').style('font-weight: 700; color: #3a281a;')
|
||||
_render_repository_block(project_bundle.get('repository') or project.get('repository'))
|
||||
|
||||
with ui.card().classes('q-pa-md'):
|
||||
ui.label('Prompt').style('font-weight: 700; color: #3a281a;')
|
||||
prompts = project_bundle.get('prompts', [])
|
||||
@@ -178,7 +214,7 @@ def create_dashboard():
|
||||
prompt = prompts[0]
|
||||
ui.markdown(f"**Requested features:** {', '.join(prompt['features']) or 'None'}")
|
||||
ui.markdown(f"**Tech stack:** {', '.join(prompt['tech_stack']) or 'None'}")
|
||||
ui.element('div').classes('factory-code').set_text(prompt['prompt_text'])
|
||||
ui.label(prompt['prompt_text']).classes('factory-code')
|
||||
else:
|
||||
ui.label('No prompt recorded.').classes('factory-muted')
|
||||
|
||||
@@ -219,9 +255,11 @@ def create_dashboard():
|
||||
ui.label('Each prompt entry is linked to the generated files recorded after that prompt for the same project.').classes('factory-muted')
|
||||
if correlations:
|
||||
for correlation in correlations:
|
||||
correlation_project = project_repository_map.get(correlation['project_id'], {})
|
||||
with ui.card().classes('q-pa-md q-mt-md'):
|
||||
ui.label(correlation['project_id']).style('font-size: 1rem; font-weight: 700; color: #2f241d;')
|
||||
ui.element('div').classes('factory-code q-mt-sm').set_text(correlation['prompt_text'])
|
||||
ui.label(correlation_project.get('project_name') or correlation['project_id']).style('font-size: 1rem; font-weight: 700; color: #2f241d;')
|
||||
_render_repository_block(correlation_project.get('repository'))
|
||||
ui.label(correlation['prompt_text']).classes('factory-code q-mt-sm')
|
||||
if correlation['changes']:
|
||||
for change in correlation['changes']:
|
||||
ui.markdown(
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
from collections.abc import Generator
|
||||
from pathlib import Path
|
||||
from urllib.parse import urlparse
|
||||
|
||||
from alembic import command
|
||||
from alembic.config import Config
|
||||
@@ -17,10 +18,31 @@ except ImportError:
|
||||
from models import Base
|
||||
|
||||
|
||||
def get_database_runtime_summary() -> dict[str, str]:
|
||||
"""Return a human-readable summary of the effective database backend."""
|
||||
if settings.use_sqlite:
|
||||
db_path = str(Path(settings.SQLITE_DB_PATH or "/tmp/ai_software_factory_test.db").expanduser().resolve())
|
||||
return {
|
||||
"backend": "sqlite",
|
||||
"target": db_path,
|
||||
"database": db_path,
|
||||
}
|
||||
|
||||
parsed = urlparse(settings.database_url)
|
||||
database_name = parsed.path.lstrip("/") or "unknown"
|
||||
host = parsed.hostname or "unknown-host"
|
||||
port = str(parsed.port or 5432)
|
||||
return {
|
||||
"backend": parsed.scheme.split("+", 1)[0] or "postgresql",
|
||||
"target": f"{host}:{port}/{database_name}",
|
||||
"database": database_name,
|
||||
}
|
||||
|
||||
|
||||
def get_engine() -> Engine:
|
||||
"""Create and return SQLAlchemy engine with connection pooling."""
|
||||
# Use SQLite for tests, PostgreSQL for production
|
||||
if settings.USE_SQLITE:
|
||||
if settings.use_sqlite:
|
||||
db_path = settings.SQLITE_DB_PATH or "/tmp/ai_software_factory_test.db"
|
||||
Path(db_path).expanduser().resolve().parent.mkdir(parents=True, exist_ok=True)
|
||||
db_url = f"sqlite:///{db_path}"
|
||||
@@ -31,7 +53,7 @@ def get_engine() -> Engine:
|
||||
echo=settings.LOG_LEVEL == "DEBUG"
|
||||
)
|
||||
else:
|
||||
db_url = settings.POSTGRES_URL or settings.database_url
|
||||
db_url = settings.database_url
|
||||
# PostgreSQL-specific configuration
|
||||
engine = create_engine(
|
||||
db_url,
|
||||
@@ -43,7 +65,7 @@ def get_engine() -> Engine:
|
||||
)
|
||||
|
||||
# Event listener for connection checkout (PostgreSQL only)
|
||||
if not settings.USE_SQLITE:
|
||||
if not settings.use_sqlite:
|
||||
@event.listens_for(engine, "checkout")
|
||||
def receive_checkout(dbapi_connection, connection_record, connection_proxy):
|
||||
"""Log connection checkout for audit purposes."""
|
||||
@@ -100,7 +122,7 @@ def get_alembic_config(database_url: str | None = None) -> Config:
|
||||
alembic_ini = package_root / "alembic.ini"
|
||||
config = Config(str(alembic_ini))
|
||||
config.set_main_option("script_location", str(package_root / "alembic"))
|
||||
config.set_main_option("sqlalchemy.url", database_url or (settings.database_url if not settings.USE_SQLITE else f"sqlite:///{settings.SQLITE_DB_PATH or '/tmp/ai_software_factory_test.db'}"))
|
||||
config.set_main_option("sqlalchemy.url", database_url or settings.database_url)
|
||||
return config
|
||||
|
||||
|
||||
@@ -116,7 +138,7 @@ def run_migrations(database_url: str | None = None) -> dict:
|
||||
|
||||
def init_db() -> dict:
|
||||
"""Initialize database tables and database if needed."""
|
||||
if settings.USE_SQLITE:
|
||||
if settings.use_sqlite:
|
||||
result = run_migrations()
|
||||
if result["status"] == "success":
|
||||
print("SQLite database migrations applied successfully.")
|
||||
@@ -131,7 +153,7 @@ def init_db() -> dict:
|
||||
return {'status': 'error', 'message': f'Error: {str(e)}'}
|
||||
else:
|
||||
# PostgreSQL
|
||||
db_url = settings.POSTGRES_URL or settings.database_url
|
||||
db_url = settings.database_url
|
||||
db_name = db_url.split('/')[-1] if '/' in db_url else 'ai_software_factory'
|
||||
|
||||
try:
|
||||
@@ -180,7 +202,7 @@ def init_db() -> dict:
|
||||
|
||||
def drop_db() -> dict:
|
||||
"""Drop all database tables (use with caution!)."""
|
||||
if settings.USE_SQLITE:
|
||||
if settings.use_sqlite:
|
||||
engine = get_engine()
|
||||
try:
|
||||
Base.metadata.drop_all(bind=engine)
|
||||
@@ -190,7 +212,7 @@ def drop_db() -> dict:
|
||||
print(f"Error dropping SQLite tables: {str(e)}")
|
||||
return {'status': 'error', 'message': str(e)}
|
||||
else:
|
||||
db_url = settings.POSTGRES_URL or settings.database_url
|
||||
db_url = settings.database_url
|
||||
db_name = db_url.split('/')[-1] if '/' in db_url else 'ai_software_factory'
|
||||
|
||||
try:
|
||||
|
||||
@@ -5,6 +5,7 @@ The dashboard shown is from dashboard_ui.py with real-time database data.
|
||||
"""
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.responses import RedirectResponse
|
||||
|
||||
from nicegui import app, ui
|
||||
|
||||
@@ -22,13 +23,24 @@ def init(fastapi_app: FastAPI, storage_secret: str = 'Secr2t!') -> None:
|
||||
storage_secret: Optional secret for persistent user storage.
|
||||
"""
|
||||
|
||||
@ui.page('/show')
|
||||
def show():
|
||||
def render_dashboard_page() -> None:
|
||||
create_dashboard()
|
||||
|
||||
|
||||
# NOTE dark mode will be persistent for each user across tabs and server restarts
|
||||
ui.dark_mode().bind_value(app.storage.user, 'dark_mode')
|
||||
ui.checkbox('dark mode').bind_value(app.storage.user, 'dark_mode')
|
||||
|
||||
@ui.page('/')
|
||||
def home() -> None:
|
||||
render_dashboard_page()
|
||||
|
||||
@ui.page('/show')
|
||||
def show() -> None:
|
||||
render_dashboard_page()
|
||||
|
||||
@fastapi_app.get('/dashboard', include_in_schema=False)
|
||||
def dashboard_redirect() -> RedirectResponse:
|
||||
return RedirectResponse(url='/', status_code=307)
|
||||
|
||||
ui.run_with(
|
||||
fastapi_app,
|
||||
|
||||
@@ -6,13 +6,14 @@ This application uses FastAPI to:
|
||||
2. Host NiceGUI frontend via ui.run_with()
|
||||
|
||||
The NiceGUI frontend provides:
|
||||
1. Interactive dashboard at /show
|
||||
1. Interactive dashboard at /
|
||||
2. Real-time data visualization
|
||||
3. Audit trail display
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from contextlib import asynccontextmanager
|
||||
import json
|
||||
import re
|
||||
from pathlib import Path
|
||||
@@ -42,7 +43,18 @@ except ImportError:
|
||||
|
||||
__version__ = "0.0.1"
|
||||
|
||||
app = FastAPI()
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(_app: FastAPI):
|
||||
"""Log resolved runtime configuration when the app starts."""
|
||||
runtime = database_module.get_database_runtime_summary()
|
||||
print(
|
||||
f"Runtime configuration: database_backend={runtime['backend']} target={runtime['target']}"
|
||||
)
|
||||
yield
|
||||
|
||||
|
||||
app = FastAPI(lifespan=lifespan)
|
||||
|
||||
DbSession = Annotated[Session, Depends(database_module.get_db)]
|
||||
PROJECT_ID_PATTERN = re.compile(r"[^a-z0-9]+")
|
||||
@@ -149,14 +161,15 @@ def _resolve_n8n_api_url(explicit_url: str | None = None) -> str:
|
||||
return ""
|
||||
|
||||
|
||||
@app.get('/')
|
||||
def read_root():
|
||||
"""Root endpoint that returns service metadata."""
|
||||
@app.get('/api')
|
||||
def read_api_info():
|
||||
"""Return service metadata for API clients."""
|
||||
return {
|
||||
'service': 'AI Software Factory',
|
||||
'version': __version__,
|
||||
'endpoints': [
|
||||
'/',
|
||||
'/api',
|
||||
'/health',
|
||||
'/generate',
|
||||
'/projects',
|
||||
@@ -177,9 +190,12 @@ def read_root():
|
||||
@app.get('/health')
|
||||
def health_check():
|
||||
"""Health check endpoint."""
|
||||
runtime = database_module.get_database_runtime_summary()
|
||||
return {
|
||||
'status': 'healthy',
|
||||
'database': 'sqlite' if database_module.settings.USE_SQLITE else 'postgresql',
|
||||
'database': runtime['backend'],
|
||||
'database_target': runtime['target'],
|
||||
'database_name': runtime['database'],
|
||||
}
|
||||
|
||||
|
||||
@@ -217,6 +233,7 @@ async def generate_software(request: SoftwareRequest, db: DbSession):
|
||||
response_data['tech_stack'] = request.tech_stack
|
||||
response_data['project_root'] = result.get('project_root', str(_project_root(project_id)))
|
||||
response_data['changed_files'] = result.get('changed_files', [])
|
||||
response_data['repository'] = result.get('repository')
|
||||
|
||||
return {'status': result['status'], 'data': response_data}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user