Merge pull request #91 from amazeeio/dev

PhiRho · web-flow · commit 29ce32b0b8fc · 2025-07-09T14:16:44.000+02:00
Bring main in line with Dev
diff --git a/app/api/audit.py b/app/api/audit.py
@@ -2,11 +2,11 @@
 from sqlalchemy.orm import Session
 from typing import List, Optional
 from datetime import datetime
+from sqlalchemy import distinct, text, cast, String
 from app.db.database import get_db
 from app.api.auth import get_current_user_from_auth
 from app.schemas.models import AuditLogResponse, PaginatedAuditLogResponse, AuditLogMetadata
 from app.db.models import DBAuditLog, DBUser
-from sqlalchemy import distinct
 import logging
 
 logger = logging.getLogger(__name__)
@@ -25,11 +25,12 @@ async def get_audit_logs(
     user_email: Optional[str] = None,
     from_date: Optional[datetime] = None,
     to_date: Optional[datetime] = None,
+    status_code: Optional[str] = None,
 ):
     """
     Retrieve audit logs with optional filtering.
     Only accessible by admin users.
-    event_type and resource_type can be comma-separated lists for multiple values.
+    event_type, resource_type, and status_code can be comma-separated lists for multiple values.
     """
     if not current_user.is_admin:
         logger.warning(f"Non-admin user {current_user.id} attempted to access audit logs")
@@ -56,6 +57,9 @@ async def get_audit_logs(
             query = query.filter(DBAuditLog.timestamp >= from_date)
         if to_date:
             query = query.filter(DBAuditLog.timestamp <= to_date)
+        if status_code:
+            status_codes = [sc.strip() for sc in status_code.split(',')]
+            query = query.filter(cast(DBAuditLog.details['status_code'], String).in_(status_codes))
 
         # Get total count
         total = query.count()
@@ -96,7 +100,7 @@ async def get_audit_logs_metadata(
     current_user: DBUser = Depends(get_current_user_from_auth),
 ):
     """
-    Retrieve distinct event types and resource types from audit logs.
+    Retrieve distinct event types, resource types, and status codes from audit logs.
     Only accessible by admin users.
     """
     if not current_user.is_admin:
@@ -117,9 +121,16 @@ async def get_audit_logs_metadata(
                         .filter(DBAuditLog.resource_type != '')
                         .all()]
 
+        # Get distinct status codes from the details JSON field
+        status_codes = [sc[0] for sc in db.query(distinct(cast(DBAuditLog.details['status_code'], String)))
+                       .filter(cast(DBAuditLog.details['status_code'], String).isnot(None))
+                       .filter(cast(DBAuditLog.details['status_code'], String) != '')
+                       .all()]
+
         return {
             "event_types": sorted(event_types),
-            "resource_types": sorted(resource_types)
+            "resource_types": sorted(resource_types),
+            "status_codes": sorted(status_codes, key=lambda x: int(x) if x.isdigit() else 0)
         }
 
     except Exception as e:
diff --git a/app/schemas/models.py b/app/schemas/models.py
@@ -229,6 +229,7 @@ class PaginatedAuditLogResponse(BaseModel):
 class AuditLogMetadata(BaseModel):
     event_types: List[str]
     resource_types: List[str]
+    status_codes: List[str]
     model_config = ConfigDict(from_attributes=True)
 
 # Team schemas
diff --git a/frontend/src/app/admin/audit-logs/page.tsx b/frontend/src/app/admin/audit-logs/page.tsx
@@ -45,10 +45,37 @@ interface AuditLogFilters {
   user_email?: string;
   from_date?: string;
   to_date?: string;
+  status_code?: string[];
 }
 
 const ITEMS_PER_PAGE = 20;
 
+const getStatusCodeDescription = (code: number): string => {
+  const descriptions: Record<number, string> = {
+    200: 'OK',
+    201: 'Created',
+    204: 'No Content',
+    301: 'Moved Permanently',
+    302: 'Found',
+    304: 'Not Modified',
+    307: 'Temporary Redirect',
+    308: 'Permanent Redirect',
+    400: 'Bad Request',
+    401: 'Unauthorized',
+    403: 'Forbidden',
+    404: 'Not Found',
+    405: 'Method Not Allowed',
+    409: 'Conflict',
+    422: 'Unprocessable Entity',
+    429: 'Too Many Requests',
+    500: 'Internal Server Error',
+    502: 'Bad Gateway',
+    503: 'Service Unavailable',
+    504: 'Gateway Timeout',
+  };
+  return descriptions[code] || 'Unknown';
+};
+
 export default function AuditLogsPage() {
   const { toast } = useToast();
   const [filters, setFilters] = useState<AuditLogFilters>({
@@ -61,6 +88,7 @@ export default function AuditLogsPage() {
   const [itemsPerPage] = useState<number>(ITEMS_PER_PAGE);
   const [eventTypeOptions, setEventTypeOptions] = useState<{ value: string; label: string }[]>([]);
   const [resourceTypeOptions, setResourceTypeOptions] = useState<{ value: string; label: string }[]>([]);
+  const [statusCodeOptions, setStatusCodeOptions] = useState<{ value: string; label: string }[]>([]);
 
   const fetchMetadata = useCallback(async () => {
     try {
@@ -85,6 +113,15 @@ export default function AuditLogsPage() {
             label: type.charAt(0).toUpperCase() + type.slice(1).toLowerCase(),
           }))
       );
+
+      setStatusCodeOptions(
+        (data.status_codes || [])
+          .filter(Boolean)
+          .map((code: string) => ({
+            value: code,
+            label: `${code} - ${getStatusCodeDescription(parseInt(code))}`,
+          }))
+      );
     } catch (error) {
       console.error('Error fetching audit logs metadata:', error);
       toast({
@@ -107,6 +144,7 @@ export default function AuditLogsPage() {
         ...(filters.event_type?.length && { event_type: filters.event_type.join(',') }),
         ...(filters.resource_type?.length && { resource_type: filters.resource_type.join(',') }),
         ...(filters.user_email && { user_email: filters.user_email }),
+        ...(filters.status_code?.length && { status_code: filters.status_code.join(',') }),
       }).toString();
 
       const response = await get(`audit/logs?${queryParams}`, { credentials: 'include' });
@@ -179,7 +217,7 @@ export default function AuditLogsPage() {
           <CardTitle>Filters</CardTitle>
         </CardHeader>
         <CardContent>
-          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-4">
+          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-6 gap-4">
             <div className="space-y-2">
               <label className="text-sm font-medium">Event Type</label>
               <MultiSelect
@@ -197,6 +235,18 @@ export default function AuditLogsPage() {
                 onValueChange={(value) => handleFilterChange('resource_type', value)}
                 defaultValue={filters.resource_type || []}
                 placeholder="Select Resources"
+                variant="default"
+              />
+            </div>
+
+            <div className="space-y-2">
+              <label className="text-sm font-medium">Status Code</label>
+              <MultiSelect
+                options={statusCodeOptions}
+                onValueChange={(value) => handleFilterChange('status_code', value)}
+                defaultValue={filters.status_code || []}
+                placeholder="Select Status Codes"
+                variant="default"
               />
             </div>
 
diff --git a/frontend/src/app/upgrade/page.tsx b/frontend/src/app/upgrade/page.tsx
@@ -45,7 +45,6 @@ export default function PricingTokenPage() {
     isConfigLoading,
     reset,
   } = useUpgrade();
-  console.log('upgrade page', config);
 
   // Initialize upgrade flow when component mounts or token changes
   useEffect(() => {
diff --git a/frontend/src/components/ui/multi-select.tsx b/frontend/src/components/ui/multi-select.tsx
@@ -248,19 +248,19 @@ export const MultiSelect = React.forwardRef<
                     </Badge>
                   )}
                 </div>
-                <div className="flex items-center justify-between">
+                <div className="flex items-center justify-between gap-1">
                   <XIcon
-                    className="h-4 mx-2 cursor-pointer text-muted-foreground"
+                    className="h-4 mx-2 cursor-pointer text-muted-foreground flex items-center justify-center"
                     onClick={(event) => {
                       event.stopPropagation();
                       handleClear();
                     }}
                   />
                   <Separator
                     orientation="vertical"
-                    className="flex min-h-6 h-full"
+                    className="flex min-h-6 h-full mx-1"
                   />
-                  <ChevronDown className="h-4 mx-2 cursor-pointer text-muted-foreground" />
+                  <ChevronDown className="h-4 mx-2 cursor-pointer text-muted-foreground flex items-center justify-center" />
                 </div>
               </div>
             ) : (
diff --git a/frontend/src/stores/use-config.ts b/frontend/src/stores/use-config.ts
@@ -12,62 +12,64 @@ interface ConfigState {
   config: Config | null;
   loading: boolean;
   error: string | null;
+  isLoaded: boolean;
   setConfig: (config: Config) => void;
   setLoading: (loading: boolean) => void;
   setError: (error: string | null) => void;
-  loadConfig: () => Promise<void>;
+  setIsLoaded: (isLoaded: boolean) => void;
+  loadConfig: () => Promise<Config | null>;
   getApiUrl: () => string;
 }
 
-const fallbackConfig: Config = {
-  NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8800',
-  PASSWORDLESS_SIGN_IN: process.env.PASSWORDLESS_SIGN_IN === 'true',
-  STRIPE_PUBLISHABLE_KEY: process.env.STRIPE_PUBLISHABLE_KEY || '',
-};
 
 export const useConfig = create<ConfigState>((set, get) => ({
-  config: fallbackConfig,
+  config: null,
   loading: false,
   error: null,
+  isLoaded: false,
   
   setConfig: (config) => set({ config, error: null }),
   setLoading: (loading) => set({ loading }),
   setError: (error) => set({ error, loading: false }),
+  setIsLoaded: (isLoaded) => set({ isLoaded }),
   
   loadConfig: async () => {
     const state = get();
-    if (state.loading) return; // Prevent multiple simultaneous requests
+    
+    if (state.isLoaded && state.config) {
+      return state.config; // Return cached config if already loaded successfully
+    }
+    
+    if (state.loading) {
+      return null; // Return null if already loading
+    }
     
     set({ loading: true, error: null });
     
     try {
       const response = await fetch('/api/config');
-      console.log(response);
       if (!response.ok) {
         throw new Error('Failed to load configuration');
       }
       
       const config: Config = await response.json();
-      console.log(config);
-      set({ config, loading: false, error: null });
+      set({ config, loading: false, error: null, isLoaded: true });
+      return config;
     } catch (error) {
       console.error('Error loading configuration:', error);
-      console.log('error', fallbackConfig);
       set({ 
-        config: fallbackConfig, 
+        config: null, 
         loading: false, 
-        error: error instanceof Error ? error.message : 'Failed to load configuration'
+        error: error instanceof Error ? error.message : 'Failed to load configuration',
+        isLoaded: false
       });
+      return null;
     }
   },
   
   getApiUrl: () => {
     const state = get();
-    return state.config?.NEXT_PUBLIC_API_URL || fallbackConfig.NEXT_PUBLIC_API_URL;
+    return state.config?.NEXT_PUBLIC_API_URL || 'http://localhost:8800';
   },
 }));
 
-// Initialize config on store creation (only in browser environment)
-if (typeof window !== 'undefined') {
-  useConfig.getState().loadConfig();
-}
diff --git a/frontend/src/stores/use-upgrade.ts b/frontend/src/stores/use-upgrade.ts
@@ -91,17 +91,13 @@ export const useUpgrade = create<UpgradeState>((set, get) => ({
     try {
       const configStore = useConfig.getState();
       
-      // Always try to load config from API to ensure we have the latest
-      await configStore.loadConfig();
+      // Load config and get it directly from the return value
+      const config = await configStore.loadConfig();
       
-      // Get the config from the config store after loading
-      const updatedConfigStore = useConfig.getState();
-      const config = updatedConfigStore.config;
-      console.log('load config', config);
-      
-      if (config) {
+      if (config && config.STRIPE_PUBLISHABLE_KEY) {
         set({ config, error: null });
       } else {
+        console.error('Config missing or invalid:', config);
         set({ 
           error: 'Failed to load configuration. Please try again later.',
           config: null 
diff --git a/helm/README.md b/helm/README.md
@@ -194,16 +194,21 @@ helm install amazee-ai . -n amazee-ai --create-namespace \
 
 | Parameter | Description | Default |
 |-----------|-------------|---------|
+| `global.environment` | Global environment setting | `production` |
 | `postgresql.enabled` | Deploy Bitnami PostgreSQL chart | `true` |
+| `postgresql.external.enabled` | Use external managed PostgreSQL | `false` |
+| `postgresql.external.url` | External PostgreSQL connection URL | `postgresql://user:password@host:port/database` |
 | `postgresql.auth.postgresPassword` | PostgreSQL password | `postgres` |
 | `postgresql.auth.database` | PostgreSQL database name | `postgres_service` |
 | `postgresql.primary.persistence.enabled` | Enable persistence for PostgreSQL | `true` |
+| `postgresql.primary.persistence.storageClass` | Storage class for PostgreSQL | `standard` |
 | `postgresql.primary.persistence.size` | Storage size for PostgreSQL | `10Gi` |
 | `backend.enabled` | Deploy backend subchart | `true` |
 | `backend.replicas` | Number of backend replicas | `1` |
 | `backend.image.repository` | Backend image repository | `ghcr.io/amazeeio/amazee.ai-backend` |
 | `backend.image.tag` | Backend image tag | `dev` |
-| `backend.database.url` | Database connection URL | `postgresql://postgres:postgres@amazee-ai-postgresql:5432/postgres_service` |
+| `backend.image.pullPolicy` | Backend image pull policy | `IfNotPresent` |
+| `backend.database.url` | Database connection URL (auto-generated if empty) | `""` |
 | `backend.secretKey` | Key used to hash passwords stored in the database | `my-secret-key` |
 | `backend.stripeSecretKey` | Stripe secret key | `sk_test_your_stripe_secret_key` |
 | `backend.webhookSig` | Webhook signature (only needed for local development with Stripe CLI) | `""` |
@@ -224,17 +229,24 @@ helm install amazee-ai . -n amazee-ai --create-namespace \
 | `frontend.replicas` | Number of frontend replicas | `1` |
 | `frontend.image.repository` | Frontend image repository | `ghcr.io/amazeeio/amazee.ai-frontend` |
 | `frontend.image.tag` | Frontend image tag | `dev` |
-| `frontend.apiUrl` | Backend API URL | `http://backend:8800` |
+| `frontend.image.pullPolicy` | Frontend image pull policy | `IfNotPresent` |
+| `frontend.apiUrl` | Backend API URL (auto-generated if empty) | `""` |
 | `frontend.stripePublishableKey` | Stripe publishable key | `pk_test_your_stripe_publishable_key` |
 | `frontend.passwordlessSignIn` | Enable passwordless sign-in | `true` |
-| `frontend.resources.requests.memory` | Frontend memory request | `256Mi` |
+| `frontend.resources.requests.memory` | Frontend memory request | `512Mi` |
 | `frontend.resources.requests.cpu` | Frontend CPU request | `250m` |
-| `frontend.resources.limits.memory` | Frontend memory limit | `512Mi` |
+| `frontend.resources.limits.memory` | Frontend memory limit | `1Gi` |
 | `frontend.resources.limits.cpu` | Frontend CPU limit | `500m` |
 | `ingress.enabled` | Enable backend API ingress | `true` |
 | `ingress.className` | Backend ingress class name | `nginx` |
+| `ingress.annotations` | Backend ingress annotations | See values.yaml |
+| `ingress.hosts` | Backend ingress hosts | `api.amazee-ai.local` |
+| `ingress.tls` | Backend ingress TLS configuration | `[]` |
 | `frontendIngress.enabled` | Enable frontend web interface ingress | `true` |
 | `frontendIngress.className` | Frontend ingress class name | `nginx` |
+| `frontendIngress.annotations` | Frontend ingress annotations | See values.yaml |
+| `frontendIngress.hosts` | Frontend ingress hosts | `amazee-ai.local` |
+| `frontendIngress.tls` | Frontend ingress TLS configuration | `[]` |
 
 ## Environment Variables
 
diff --git a/tests/test_audit.py b/tests/test_audit.py
