Merge pull request #2878 from Agenta-AI/release/v0.59.11

release/v0.59.11

Author: mmabrouk

api/oss/src/__init__.py

@@ -158,10 +158,19 @@ async def _get_blocked_emails() -> Set[str]:
 
 async def _is_blocked(email: str) -> bool:
     email = email.lower()
-    if email in await _get_blocked_emails():
+    domain = email.split("@")[-1] if "@" in email else ""
+    allowed_domains = env.AGENTA_ALLOWED_DOMAINS
+    is_domain_allowed = allowed_domains and domain in allowed_domains
+
+    if allowed_domains and not is_domain_allowed:
         return True
-    if "@" in email and email.split("@")[-1] in await _get_blocked_domains():
+
+    if email and email in await _get_blocked_emails():
         return True
+
+    if domain and domain in await _get_blocked_domains() and not is_domain_allowed:
+        return True
+
     return False
 
 

api/oss/src/utils/env.py

@@ -89,6 +89,11 @@ class EnvironSettings(BaseModel):
         for e in (os.getenv("AGENTA_BLOCKED_DOMAINS") or "").split(",")
         if e.strip()
     }
+    AGENTA_ALLOWED_DOMAINS: set = {
+        e.strip().lower()
+        for e in (os.getenv("AGENTA_ALLOWED_DOMAINS") or "").split(",")
+        if e.strip()
+    }
 
     # AGENTA-SPECIFIC (INTERNAL INFRA)
     DOCKER_NETWORK_MODE: str = os.getenv("DOCKER_NETWORK_MODE") or "bridge"

api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "api"
-version = "0.59.10"
+version = "0.59.11"
 description = "Agenta API"
 authors = [
     { name = "Mahmoud Mabrouk", email = "mahmoud@agenta.ai" },

docs/docs/self-host/02-configuration.mdx

@@ -55,6 +55,7 @@ Optional Agenta-specific configurations:
 | `AGENTA_SEND_EMAIL_FROM_ADDRESS` | From address for system emails | `mail@example.com` |
 | `AGENTA_API_INTERNAL_URL` | Internal API URL for services | _(empty)_ |
 | `AGENTA_SERVICE_MIDDLEWARE_CACHE_ENABLED` | Enable middleware caching in the chat and completion services | `true` |
+| `AGENTA_ALLOWED_DOMAINS` | Comma-separated list of email domains allowed to authenticate; when set, all other domains are rejected | _(empty)_ |
 | `AGENTA_OTLP_MAX_BATCH_BYTES` | Max OTLP batch size before requests are rejected with 413 | `10485760` (10MB) |
 
 ### Third-party (Required)
@@ -238,4 +239,3 @@ TRAEFIK_PORT=80
 For configuration assistance:
 - Check the [GitHub issues](https://github.com/Agenta-AI/agenta/issues)
 - Join our [Slack community](https://join.slack.com/t/agenta-hq/shared_invite/zt-37pnbp5s6-mbBrPL863d_oLB61GSNFjw)
-- Review the deployment documentation for your specific setup

sdk/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.59.10"
+version = "0.59.11"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = [

web/ee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@agenta/ee",
-    "version": "0.59.10",
+    "version": "0.59.11",
     "private": true,
     "engines": {
         "node": ">=18"

web/ee/src/components/Evaluators/components/ConfigureEvaluator/index.tsx

@@ -103,8 +103,7 @@ const ConfigureEvaluatorPage = ({evaluatorId}: {evaluatorId?: string | null}) =>
     const handleSuccess = useCallback(async () => {
         message.success("Evaluator configuration saved")
         await refetchAll()
-        await navigateBack()
-    }, [navigateBack, refetchAll])
+    }, [refetchAll])
 
     if (!router.isReady || isLoading) {
         return <ConfigureEvaluatorSkeleton />

web/ee/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/ConfigureEvaluator/DynamicFormField.tsx

@@ -1,11 +1,12 @@
+import {useCallback} from "react"
+
 import {InfoCircleOutlined} from "@ant-design/icons"
-import Editor from "@monaco-editor/react"
 import {theme, Form, Tooltip, InputNumber, Switch, Input, AutoComplete} from "antd"
-import {Rule} from "antd/es/form"
+import {FormInstance, Rule} from "antd/es/form"
 import Link from "next/link"
 import {createUseStyles} from "react-jss"
 
-import {useAppTheme} from "@/oss/components/Layout/ThemeContextProvider"
+import SharedEditor from "@/oss/components/Playground/Components/SharedEditor"
 import {isValidRegex} from "@/oss/lib/helpers/validators"
 import {generatePaths} from "@/oss/lib/transformers"
 import {EvaluationSettingsTemplate, JSSTheme} from "@/oss/lib/Types"
@@ -15,15 +16,24 @@ import {Messages} from "./Messages"
 type DynamicFormFieldProps = EvaluationSettingsTemplate & {
     name: string | string[]
     traceTree: Record<string, any>
+    form?: FormInstance<any>
 }
 
 const useStyles = createUseStyles((theme: JSSTheme) => ({
-    editor: {
-        border: `1px solid ${theme.colorBorder}`,
-        borderRadius: theme.borderRadius,
-        overflow: "hidden",
-        "& .monaco-editor": {
-            width: "0 !important",
+    codeEditor: {
+        "& .agenta-editor-wrapper": {
+            minHeight: 375,
+        },
+        "&.agenta-shared-editor": {
+            borderColor: theme.colorBorder,
+        },
+    },
+    objectEditor: {
+        "& .agenta-editor-wrapper": {
+            minHeight: 120,
+        },
+        "&.agenta-shared-editor": {
+            borderColor: theme.colorBorder,
         },
     },
     ExternalHelp: {
@@ -45,6 +55,41 @@ const useStyles = createUseStyles((theme: JSSTheme) => ({
     },
 }))
 
+interface ControlledSharedEditorProps {
+    value?: unknown
+    onChange?: (value: string) => void
+    className?: string
+    language?: "json" | "yaml" | "code"
+}
+
+const ControlledSharedEditor = ({
+    value,
+    onChange,
+    className,
+    language,
+}: ControlledSharedEditorProps) => {
+    const handleValueChange = useCallback(
+        (next: string) => {
+            onChange?.(next)
+        },
+        [onChange],
+    )
+
+    return (
+        <SharedEditor
+            initialValue={value}
+            value={value as string}
+            handleChange={handleValueChange}
+            className={className}
+            syncWithInitialValueChanges
+            editorProps={{
+                codeOnly: true,
+                ...(language ? {language} : {}),
+            }}
+        />
+    )
+}
+
 export const DynamicFormField: React.FC<DynamicFormFieldProps> = ({
     name,
     label,
@@ -55,11 +100,24 @@ export const DynamicFormField: React.FC<DynamicFormFieldProps> = ({
     max,
     required,
     traceTree,
+    form,
 }) => {
-    const {appTheme} = useAppTheme()
+    const settingsValue = Form.useWatch(name, form)
+
     const classes = useStyles()
     const {token} = theme.useToken()
 
+    const handleValueChange = useCallback(
+        (next: string) => {
+            if (form) {
+                form.setFieldsValue({
+                    [name as string]: next,
+                })
+            }
+        },
+        [form, name],
+    )
+
     const rules: Rule[] = [{required: required ?? true, message: "This field is required"}]
     if (type === "regex")
         rules.push({
@@ -100,7 +158,11 @@ export const DynamicFormField: React.FC<DynamicFormFieldProps> = ({
                             )}
                         </div>
                     }
-                    initialValue={defaultVal}
+                    initialValue={
+                        type === "object" && defaultVal && typeof defaultVal === "object"
+                            ? JSON.stringify(defaultVal, null, 2)
+                            : defaultVal
+                    }
                     rules={rules}
                     hidden={type === "hidden"}
                 >
@@ -126,21 +188,18 @@ export const DynamicFormField: React.FC<DynamicFormFieldProps> = ({
                     ) : type === "text" ? (
                         <Input.TextArea rows={10} />
                     ) : type === "code" ? (
-                        <Editor
-                            className={classes.editor}
-                            height={375}
-                            width="100%"
-                            language="python"
-                            theme={`vs-${appTheme}`}
+                        <ControlledSharedEditor
+                            className={classes.codeEditor}
+                            value={settingsValue}
+                            onChange={handleValueChange}
+                            language="code"
                         />
                     ) : type === "object" ? (
-                        <Editor
-                            className={classes.editor}
-                            height={120}
-                            width="100%"
+                        <ControlledSharedEditor
+                            className={classes.objectEditor}
                             language="json"
-                            options={{lineNumbers: "off"}}
-                            theme={`vs-${appTheme}`}
+                            value={settingsValue}
+                            onChange={handleValueChange}
                         />
                     ) : null}
                 </Form.Item>

web/ee/src/components/pages/evaluations/autoEvaluation/EvaluatorsModal/ConfigureEvaluator/index.tsx

@@ -244,6 +244,7 @@ const ConfigureEvaluator = ({
                                             {...field}
                                             key={field.key}
                                             traceTree={traceTree}
+                                            form={form}
                                             name={["settings_values", field.key]}
                                         />
                                     ))}

web/oss/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@agenta/oss",
-    "version": "0.59.10",
+    "version": "0.59.11",
     "private": true,
     "engines": {
         "node": ">=18"