Marius Mutu
87bd04e3ff
- Add YTD year-over-year comparison table for cash flow evolution - Extend monthly evolution from 6 to 12 months with dynamic year extraction - Simplify monthly view to show only Net values aligned with YTD table - Upgrade client/supplier display from Top 5 to Top 10 with alphabetical sorting - Remove Refresh and Export buttons from dashboard and evolution views - Add get_trends() API method for 12-month historical data from backend - Fix default years to 2025/2024 for accurate YTD calculations Changes: - client.py: New get_trends() method calls /api/dashboard/trends endpoint - helpers.py: Rewrite get_cashflow_evolution_data() to use trends and calculate YTD - formatters.py: Complete redesign with YTD table and simplified 12-month Net view - menus.py: Alphabetical sorting for clients/suppliers, removed refresh buttons - handlers.py: Disabled refresh/export buttons on dashboard and evolution views 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
675 lines
21 KiB
Python
675 lines
21 KiB
Python
"""
|
|
API Client for ROA2WEB Backend Communication
|
|
|
|
This module provides an async HTTP client for communicating with the FastAPI backend.
|
|
Handles authentication, requests, error handling, and response parsing.
|
|
"""
|
|
|
|
import logging
|
|
import os
|
|
from typing import Optional, Dict, Any, List
|
|
from datetime import datetime
|
|
|
|
import httpx
|
|
from httpx import AsyncClient, Response, HTTPError, ConnectError
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Backend configuration from environment
|
|
# Default to port 8000 (production) instead of 8001 (development)
|
|
BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:8000")
|
|
REQUEST_TIMEOUT = float(os.getenv("API_TIMEOUT", "30.0")) # 30 seconds default
|
|
|
|
|
|
class BackendAPIClient:
|
|
"""
|
|
Async HTTP client for ROA2WEB FastAPI backend.
|
|
|
|
Provides methods for all API endpoints used by the Telegram bot:
|
|
- Dashboard data
|
|
- Invoices search and retrieval
|
|
- Treasury/payment data
|
|
- Report exports
|
|
- Company listings
|
|
- User authentication and token management
|
|
"""
|
|
|
|
def __init__(self, base_url: str = BACKEND_URL):
|
|
"""
|
|
Initialize the API client.
|
|
|
|
Args:
|
|
base_url: Base URL of the FastAPI backend
|
|
"""
|
|
self.base_url = base_url.rstrip('/')
|
|
self.client: Optional[AsyncClient] = None
|
|
logger.info(f"Backend API client initialized with base URL: {self.base_url}")
|
|
|
|
async def __aenter__(self):
|
|
"""Async context manager entry."""
|
|
self.client = AsyncClient(
|
|
base_url=self.base_url,
|
|
timeout=REQUEST_TIMEOUT,
|
|
follow_redirects=True
|
|
)
|
|
return self
|
|
|
|
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
|
"""Async context manager exit."""
|
|
if self.client:
|
|
await self.client.aclose()
|
|
|
|
def _get_auth_headers(self, jwt_token: str) -> Dict[str, str]:
|
|
"""
|
|
Generate authentication headers with JWT token.
|
|
|
|
Args:
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
Dict with Authorization header
|
|
"""
|
|
return {
|
|
"Authorization": f"Bearer {jwt_token}",
|
|
"Content-Type": "application/json"
|
|
}
|
|
|
|
async def _handle_response(self, response: Response) -> Dict[str, Any]:
|
|
"""
|
|
Handle API response and extract data.
|
|
|
|
Args:
|
|
response: HTTP response object
|
|
|
|
Returns:
|
|
Dict: Response JSON data
|
|
|
|
Raises:
|
|
HTTPError: If response status is not successful
|
|
"""
|
|
try:
|
|
response.raise_for_status()
|
|
return response.json()
|
|
except HTTPError as e:
|
|
logger.error(f"API request failed: {e}")
|
|
logger.error(f"Response body: {response.text}")
|
|
raise
|
|
except Exception as e:
|
|
logger.error(f"Failed to parse response: {e}")
|
|
raise
|
|
|
|
# =========================================================================
|
|
# AUTHENTICATION & USER ENDPOINTS
|
|
# =========================================================================
|
|
|
|
async def verify_user(
|
|
self,
|
|
oracle_username: str,
|
|
linking_code: str
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Verify user exists in Oracle and get JWT token.
|
|
Called during Telegram linking process (auto-linking flow).
|
|
|
|
Args:
|
|
oracle_username: Oracle username extracted from linking code
|
|
linking_code: The 8-character linking code for validation
|
|
|
|
Returns:
|
|
Dict with:
|
|
- success: True if verification succeeded
|
|
- access_token: JWT access token
|
|
- refresh_token: JWT refresh token
|
|
- user: Dict with user_id, username, companies, permissions
|
|
- message: Status message
|
|
|
|
None if user not found or error
|
|
|
|
Example:
|
|
result = await client.verify_user("JOHN.DOE", "ABC12345")
|
|
if result and result['success']:
|
|
jwt_token = result['access_token']
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
# Flow A: Auto-linking (no password required)
|
|
response = await self.client.post(
|
|
"/api/telegram/auth/verify-user",
|
|
json={
|
|
"linking_code": linking_code,
|
|
"oracle_username": oracle_username
|
|
}
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except ConnectError as e:
|
|
logger.error(f"Cannot connect to backend at {self.base_url}: {e}")
|
|
logger.error("Verify that backend service is running and BACKEND_URL is correct")
|
|
return None
|
|
except HTTPError as e:
|
|
if e.response.status_code == 404:
|
|
logger.warning(f"User {oracle_username} not found in Oracle")
|
|
return None
|
|
logger.error(f"Failed to verify user {oracle_username}: {e}")
|
|
return None
|
|
except Exception as e:
|
|
logger.error(f"Error verifying user: {e}")
|
|
return None
|
|
|
|
async def refresh_token(self, refresh_token: str) -> Optional[str]:
|
|
"""
|
|
Refresh JWT token for a user.
|
|
|
|
Args:
|
|
refresh_token: JWT refresh token
|
|
|
|
Returns:
|
|
str: New JWT access token, None if failed
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.post(
|
|
"/api/telegram/auth/refresh-token",
|
|
json={"refresh_token": refresh_token}
|
|
)
|
|
|
|
data = await self._handle_response(response)
|
|
return data.get('access_token')
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to refresh token: {e}")
|
|
return None
|
|
|
|
async def get_user_companies(self, jwt_token: str) -> List[Dict[str, Any]]:
|
|
"""
|
|
Get list of companies the user has access to.
|
|
|
|
Args:
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
List of company dicts with id, nume_firma, cui, etc.
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
"/api/companies",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
data = await self._handle_response(response)
|
|
|
|
# Backend returns {"companies": [...], "total_count": N}
|
|
if isinstance(data, dict) and "companies" in data:
|
|
return data["companies"]
|
|
|
|
return data if isinstance(data, list) else []
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get companies: {e}")
|
|
return []
|
|
|
|
# =========================================================================
|
|
# DASHBOARD ENDPOINTS
|
|
# =========================================================================
|
|
|
|
async def get_dashboard_data(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get dashboard statistics for a company.
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
Dict with dashboard data (sold_total, facturi, plati, etc.)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
"/api/dashboard/summary",
|
|
params={"company": str(company_id)},
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get dashboard data for company {company_id}: {e}")
|
|
return None
|
|
|
|
async def get_treasury_breakdown(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get detailed treasury breakdown (casa + banca accounts).
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
Dict with treasury breakdown data (accounts by type)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
f"/api/dashboard/treasury-breakdown?company={company_id}",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get treasury breakdown for company {company_id}: {e}")
|
|
return None
|
|
|
|
async def get_detailed_data(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str,
|
|
data_type: str
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get detailed data for clients or suppliers.
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
data_type: Type of data ('clients' or 'suppliers')
|
|
|
|
Returns:
|
|
Dict with detailed data (list of clients/suppliers with balances)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
f"/api/dashboard/detailed-data?company={company_id}&data_type={data_type}",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get detailed data ({data_type}) for company {company_id}: {e}")
|
|
return None
|
|
|
|
async def get_maturity_data(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str,
|
|
period: str = "all"
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get maturity data (in term/overdue breakdown).
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
period: Period filter ('all', '30', '60', '90')
|
|
|
|
Returns:
|
|
Dict with maturity data (in_term, overdue, total)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
f"/api/dashboard/maturity?company={company_id}&period={period}",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get maturity data for company {company_id}: {e}")
|
|
return None
|
|
|
|
async def get_performance_data(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get performance data (incasari/plati totals).
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
Dict with performance data (incasari_total, plati_total, net)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
f"/api/dashboard/performance?company={company_id}",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get performance data for company {company_id}: {e}")
|
|
return None
|
|
|
|
async def get_monthly_flows(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str,
|
|
months: int = 12
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get monthly cash flows data.
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
months: Number of months to retrieve
|
|
|
|
Returns:
|
|
Dict with monthly flows (months, incasari, plati arrays)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
f"/api/dashboard/monthly-flows?company={company_id}&months={months}",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get monthly flows for company {company_id}: {e}")
|
|
return None
|
|
|
|
async def get_trends(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str,
|
|
period: str = "12m"
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get trends data (12-month historical data for collections/payments).
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
period: Period for trends (e.g., "12m", "6m", "ytd")
|
|
|
|
Returns:
|
|
Dict with trends data including periods, clienti_incasat, furnizori_achitat arrays
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
f"/api/dashboard/trends?company={company_id}&period={period}",
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get trends for company {company_id}: {e}")
|
|
return None
|
|
|
|
# =========================================================================
|
|
# INVOICES ENDPOINTS
|
|
# =========================================================================
|
|
|
|
async def search_invoices(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str,
|
|
filters: Optional[Dict[str, Any]] = None
|
|
) -> List[Dict[str, Any]]:
|
|
"""
|
|
Search invoices with optional filters.
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
filters: Optional filters dict:
|
|
- date_from: str (YYYY-MM-DD)
|
|
- date_to: str (YYYY-MM-DD)
|
|
- status: str (paid, unpaid, overdue)
|
|
- client_name: str
|
|
- partner_type: str (CLIENTI, FURNIZORI)
|
|
- partner_name: str
|
|
- series: str
|
|
- number: str
|
|
|
|
Returns:
|
|
List of invoice dicts
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
params = {"company": company_id}
|
|
if filters:
|
|
params.update(filters)
|
|
|
|
# ⚠️ DEBUGGING: Log exact parameters being sent
|
|
logger.info(f"📤 Searching invoices with params: {params}")
|
|
|
|
response = await self.client.get(
|
|
"/api/invoices/",
|
|
params=params,
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
data = await self._handle_response(response)
|
|
|
|
# ⚠️ DEBUGGING: Log response
|
|
if isinstance(data, dict) and 'invoices' in data:
|
|
invoice_list = data['invoices']
|
|
logger.info(f"📥 Received {len(invoice_list)} invoices from backend")
|
|
return invoice_list
|
|
elif isinstance(data, list):
|
|
logger.info(f"📥 Received {len(data)} invoices from backend (direct list)")
|
|
return data
|
|
else:
|
|
logger.warning(f"📥 Unexpected response format: {type(data)}")
|
|
return []
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to search invoices for company {company_id}: {e}")
|
|
return []
|
|
|
|
async def get_invoice_summary(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str,
|
|
partner_type: str = "CLIENTI"
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get invoice summary statistics.
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
Dict with summary (total_count, total_amount, paid, unpaid, etc.)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
"/api/invoices/summary",
|
|
params={
|
|
"company": str(company_id),
|
|
"partner_type": partner_type
|
|
},
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get invoice summary for company {company_id}: {e}")
|
|
return None
|
|
|
|
# =========================================================================
|
|
# TREASURY ENDPOINTS
|
|
# =========================================================================
|
|
|
|
async def get_treasury_data(
|
|
self,
|
|
company_id: int,
|
|
jwt_token: str
|
|
) -> Optional[Dict[str, Any]]:
|
|
"""
|
|
Get treasury/cash flow data for a company.
|
|
|
|
Args:
|
|
company_id: Company ID
|
|
jwt_token: JWT access token
|
|
|
|
Returns:
|
|
Dict with treasury data (cash_balance, incoming, outgoing, etc.)
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get(
|
|
"/api/treasury/bank-cash-register",
|
|
params={
|
|
"company": str(company_id),
|
|
"page": 1,
|
|
"page_size": 1000
|
|
},
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
return await self._handle_response(response)
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to get treasury data for company {company_id}: {e}")
|
|
return None
|
|
|
|
# =========================================================================
|
|
# EXPORT ENDPOINTS
|
|
# =========================================================================
|
|
|
|
async def export_report(
|
|
self,
|
|
jwt_token: str,
|
|
report_type: str,
|
|
company_id: int,
|
|
format: str = "xlsx",
|
|
filters: Optional[Dict[str, Any]] = None
|
|
) -> Optional[bytes]:
|
|
"""
|
|
Generate and export a report.
|
|
|
|
Args:
|
|
jwt_token: JWT access token
|
|
report_type: Type of report ('dashboard', 'invoices', 'treasury')
|
|
company_id: Company ID
|
|
format: Export format ('xlsx', 'csv', 'pdf')
|
|
filters: Optional filters for data
|
|
|
|
Returns:
|
|
bytes: File content, None if failed
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
request_data = {
|
|
"type": report_type,
|
|
"company_id": company_id,
|
|
"format": format,
|
|
"filters": filters or {}
|
|
}
|
|
|
|
response = await self.client.post(
|
|
"/api/telegram/export",
|
|
json=request_data,
|
|
headers=self._get_auth_headers(jwt_token)
|
|
)
|
|
|
|
response.raise_for_status()
|
|
return response.content
|
|
|
|
except Exception as e:
|
|
logger.error(f"Failed to export report: {e}")
|
|
return None
|
|
|
|
# =========================================================================
|
|
# HEALTH CHECK
|
|
# =========================================================================
|
|
|
|
async def health_check(self) -> bool:
|
|
"""
|
|
Check if backend is healthy and reachable.
|
|
|
|
Returns:
|
|
bool: True if backend is healthy
|
|
"""
|
|
try:
|
|
if not self.client:
|
|
self.client = AsyncClient(base_url=self.base_url, timeout=REQUEST_TIMEOUT)
|
|
|
|
response = await self.client.get("/api/telegram/health")
|
|
return response.status_code == 200
|
|
|
|
except Exception as e:
|
|
logger.error(f"Backend health check failed: {e}")
|
|
return False
|
|
|
|
|
|
# Singleton instance for global use
|
|
_backend_client_instance: Optional[BackendAPIClient] = None
|
|
|
|
|
|
def get_backend_client() -> BackendAPIClient:
|
|
"""
|
|
Get or create the singleton BackendAPIClient instance.
|
|
|
|
Returns:
|
|
BackendAPIClient: Singleton instance
|
|
"""
|
|
global _backend_client_instance
|
|
if _backend_client_instance is None:
|
|
_backend_client_instance = BackendAPIClient()
|
|
return _backend_client_instance
|
|
|
|
|
|
# Export main classes and functions
|
|
__all__ = [
|
|
'BackendAPIClient',
|
|
'get_backend_client',
|
|
'BACKEND_URL'
|
|
]
|