From dbba30656cc14f158a35a5763b721c8cc77c540f Mon Sep 17 00:00:00 2001 From: tibz Date: Wed, 8 Apr 2026 18:27:48 +0200 Subject: [PATCH 1/9] feat(proconnect): add proconnect button - update cursor when hovering proconnect and login buttons --- playground/app/app.py | 1 + .../app/features/auth/components/forms.py | 34 +++++++++++++++++++ playground/assets/proconnect.css | 26 ++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 playground/assets/proconnect.css diff --git a/playground/app/app.py b/playground/app/app.py index d128123cf..70a0713f8 100644 --- a/playground/app/app.py +++ b/playground/app/app.py @@ -122,6 +122,7 @@ def providers() -> rx.Component: # Create the app with theme configuration app = rx.App( + stylesheets=["proconnect.css"], theme=rx.theme( has_background=configuration.settings.playground_theme_has_background, accent_color=configuration.settings.playground_theme_accent_color, diff --git a/playground/app/features/auth/components/forms.py b/playground/app/features/auth/components/forms.py index 6074291c2..b5cde16e6 100644 --- a/playground/app/features/auth/components/forms.py +++ b/playground/app/features/auth/components/forms.py @@ -61,10 +61,44 @@ def login_form() -> rx.Component: width="100%", loading=AuthState.is_loading, disabled=AuthState.is_loading, + cursor="pointer", ), spacing="4", width="100%", ), + rx.vstack( + rx.hstack( + rx.separator(flex_grow="1"), + rx.text("ou", size="1", color=rx.color("gray", 9)), + rx.separator(flex_grow="1"), + width="100%", + align="center", + spacing="2", + ), + rx.center( + rx.el.button( + rx.el.span( + "S'identifier avec ProConnect", + class_name="proconnect-sr-only", + ), + class_name="proconnect-button", + type="button", + ), + width="100%", + ), + rx.center( + rx.el.a( + "Qu'est-ce que ProConnect ?", + href="https://www.proconnect.gouv.fr/", + target="_blank", + rel="noopener noreferrer", + ), + width="100%", + ), + spacing="3", + width="100%", + padding_top="1em", + ), spacing="0", width="100%", ), diff --git a/playground/assets/proconnect.css b/playground/assets/proconnect.css new file mode 100644 index 000000000..ed73828e3 --- /dev/null +++ b/playground/assets/proconnect.css @@ -0,0 +1,26 @@ +.proconnect-sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border-width: 0; +} + +.proconnect-button { + background-color: transparent !important; + background-image: url("data:image/svg+xml;base64,<svg xmlns='http://www.w3.org/2000/svg' width='211' height='58' fill='none'><path fill='#000091' d='M0 0h211v58H0z'/><path fill='#fff' d='m69.986 26.368 1.156-1.071c.833 1.054 1.819 1.598 2.941 1.598 1.292 0 2.04-.816 2.04-1.904 0-2.55-5.627-2.244-5.627-6.035 0-1.734 1.428-3.196 3.451-3.196 1.683 0 2.907.765 3.791 1.938l-1.19 1.037c-.697-1.003-1.547-1.547-2.584-1.547-1.105 0-1.836.748-1.836 1.734 0 2.567 5.627 2.244 5.627 6.052 0 2.023-1.581 3.349-3.655 3.349-1.768 0-3.077-.663-4.114-1.955Zm10.817-5.712H79.46l1.445-4.556h1.649l-1.751 4.556Zm4.818-3.451c-.56 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM84.891 28v-8.568h1.444V28H84.89Zm3.767-4.284c0-2.499 1.717-4.624 4.403-4.624 1.241 0 2.261.459 3.043 1.292V15.25h1.445V28h-1.445v-.952c-.782.833-1.802 1.292-3.043 1.292-2.686 0-4.403-2.125-4.403-4.624Zm1.53 0c0 1.819 1.224 3.264 3.043 3.264 1.19 0 2.21-.578 2.873-1.598V22.05c-.68-1.037-1.7-1.598-2.873-1.598-1.819 0-3.043 1.445-3.043 3.264Zm18.023 2.873c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM110.473 28v-8.568h1.445v.969c.697-.765 1.581-1.309 2.856-1.309 1.921 0 3.349 1.292 3.349 3.723V28h-1.462v-5.134c0-1.53-.85-2.414-2.176-2.414-1.241 0-2.023.714-2.567 1.615V28h-1.445Zm11.052-2.873v-4.369h-1.615v-1.326h1.615V17.29h1.462v2.142h2.975v1.326h-2.975v4.369c0 1.343.68 1.717 1.717 1.717.561 0 .952-.068 1.275-.204v1.292c-.408.17-.867.238-1.479.238-1.904 0-2.975-.952-2.975-3.043Zm7.377-7.922c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM128.171 28v-8.568h1.445V28h-1.445Zm3.377-8.568h1.615v-1.054c0-1.836 1.207-3.128 3.043-3.128.952 0 1.7.34 2.21.833l-.901 1.054a1.633 1.633 0 0 0-1.292-.578c-.935 0-1.598.68-1.598 1.785v1.088h2.975v1.326h-2.975V28h-1.462v-7.242h-1.615v-1.326Zm8.543-2.227c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM139.36 28v-8.568h1.445V28h-1.445Zm12.115-1.411c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM153.737 28v-8.568h1.445v1.071c.629-.748 1.411-1.241 2.499-1.241.272 0 .527.034.731.102v1.496a3.105 3.105 0 0 0-.85-.119c-1.122 0-1.853.578-2.38 1.445V28h-1.445Zm13.685.34c-1.683 0-2.822-.952-2.822-2.448 0-1.326.986-2.278 2.822-2.567l2.873-.476v-.595c0-1.19-.85-1.87-2.057-1.87-1.003 0-1.836.442-2.329 1.19l-1.088-.833c.748-1.02 1.955-1.649 3.451-1.649 2.176 0 3.468 1.275 3.468 3.162V28h-1.445v-1.088c-.646.901-1.717 1.428-2.873 1.428Zm-1.377-2.499c0 .731.629 1.292 1.615 1.292 1.139 0 2.04-.595 2.635-1.581V23.92l-2.533.442c-1.19.187-1.717.731-1.717 1.479Zm7.252-6.409h1.564l2.737 7.055 2.737-7.055h1.564L178.55 28h-1.904l-3.349-8.568Zm17.856 7.157c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261Zm10.185 6.647c1.054 0 1.904-.51 2.431-1.275l1.156.884c-.799 1.071-2.04 1.751-3.604 1.751-2.839 0-4.658-2.125-4.658-4.624 0-2.499 1.819-4.624 4.658-4.624 1.547 0 2.805.697 3.604 1.751l-1.156.884a2.925 2.925 0 0 0-2.448-1.275c-1.836 0-3.145 1.445-3.145 3.264 0 1.836 1.309 3.264 3.162 3.264ZM70.854 45V32.4h4.158c2.772 0 4.464 1.422 4.464 3.762 0 2.322-1.692 3.744-4.464 3.744H73.41V45h-2.556Zm4.266-10.422h-1.71v3.15h1.71c1.08 0 1.728-.576 1.728-1.602 0-.954-.648-1.548-1.728-1.548ZM81.249 45v-9.072h2.286v.9c.594-.612 1.368-1.08 2.394-1.08.306 0 .576.054.792.126v2.394a3.938 3.938 0 0 0-1.008-.126c-1.116 0-1.836.612-2.178 1.17V45h-2.286Zm11.386-9.432c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm13.172-.234c1.44 0 2.574-.702 3.294-1.728l2.016 1.548c-1.152 1.566-3.024 2.574-5.31 2.574-3.978 0-6.696-3.06-6.696-6.66s2.718-6.66 6.696-6.66c2.286 0 4.158 1.026 5.31 2.556l-2.016 1.566c-.72-1.026-1.854-1.728-3.294-1.728-2.376 0-4.068 1.854-4.068 4.266s1.692 4.266 4.068 4.266Zm11.366-7.398c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm7.018 1.8v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm11.091 0v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm19.444-1.476c-.846 1.134-2.25 1.836-3.96 1.836-3.222 0-5.04-2.25-5.04-4.896 0-2.682 1.692-4.896 4.662-4.896 2.52 0 4.176 1.692 4.176 4.068 0 .504-.072.99-.144 1.296h-6.354c.144 1.494 1.188 2.376 2.736 2.376.99 0 1.8-.432 2.286-1.08l1.638 1.296Zm-4.338-6.048c-1.116 0-1.872.54-2.178 1.728h4.086c-.036-.9-.702-1.728-1.908-1.728Zm10.696 5.724c.882 0 1.584-.432 2.016-1.062l1.818 1.386c-.846 1.116-2.178 1.836-3.834 1.836-3.132 0-5.004-2.25-5.004-4.896s1.872-4.896 5.004-4.896c1.656 0 2.988.72 3.834 1.836l-1.818 1.386c-.432-.63-1.116-1.062-2.052-1.062-1.494 0-2.592 1.152-2.592 2.736 0 1.602 1.098 2.736 2.628 2.736Zm6.204-1.512v-3.672h-1.692v-2.088h1.692V33.66h2.304v2.268h2.772v2.088h-2.772v3.672c0 1.008.54 1.404 1.44 1.404.63 0 1.044-.072 1.35-.198v1.998c-.45.198-.99.288-1.746.288-2.268 0-3.348-1.278-3.348-3.492Z'/><path fill='#000091' d='M46.992 19.098 31.998 10.42l-14.994 8.76a.606.606 0 0 0-.306.525v16.948a.666.666 0 0 0 .306.524l14.992 8.6 14.994-8.706a.666.666 0 0 0 .306-.524V19.626a.604.604 0 0 0-.304-.528Z'/><path fill='#FCC63A' d='m26.641 19.598-5.029 8.628-4.557-9.175 5.39-3.113 4.489 3.16-.293.5Zm20.656 16.98V19.62a.6.6 0 0 0-.306-.523L31.998 10.42'/><path fill='#0063CB' d='M16.7 36.578 32 10.42v35.362l-14.996-8.605a.665.665 0 0 1-.306-.524V19.706l.002 16.872Zm24.669-20.735 5.458 3.155-4.489 9.15-5.387-9.236 4.418-3.07Z'/><path fill='#fff' d='m51.606 16.303-19.19-11.02a.933.933 0 0 0-.832 0l-19.19 11.02a.887.887 0 0 0-.394.695v22a.885.885 0 0 0 .394.7l19.189 11.02a.932.932 0 0 0 .832 0l19.191-11.02a.886.886 0 0 0 .394-.7v-22a.887.887 0 0 0-.394-.695ZM22.789 34.059h.079c-.042 0-.079.007-.079.05 0 .1.151 0 .2.1a.912.912 0 0 0-.629.276c0 .05.1.05.151.05-.075.1-.226.05-.277.152a.176.176 0 0 0 .1.05c-.05 0-.1 0-.1.05v.152c-.126 0-.176.1-.277.15.2.152.327 0 .528 0-.528.2-.956.479-1.484.63-.1 0 0 .15-.1.15.151.1.227-.05.377-.05-.654.378-1.333.7-2.037 1.133a.351.351 0 0 0-.1.2h-.2c-.1.05-.05.176-.151.277.226.15.5-.2.654 0 .05 0-.1.05-.2.05-.05 0-.05.1-.1.1h-.154c-.1.075-.2.126-.2.276a.22.22 0 0 0-.226.1 9.031 9.031 0 0 0 3.144-.578 7.683 7.683 0 0 0 2.088-1.56.176.176 0 0 1 .05.1c-.147.437-.43.816-.806 1.08-.277.152-.478.378-.7.479a4.057 4.057 0 0 0-.428.276c-.632.197-1.281.335-1.939.412l-.305.044c-.225.033-.449.069-.671.108l-1.993-1.138a.647.647 0 0 1-.288-.411.57.57 0 0 0 .094-.063.266.266 0 0 0-.113-.071v-.65a12.782 12.782 0 0 0 3.038-.942 8.746 8.746 0 0 0-3.037-1.343v-1.515a11.67 11.67 0 0 1 1.639.392 6.42 6.42 0 0 1 1.182.578c.147.14.307.267.478.377a.91.91 0 0 0 .8.05h.33a3.961 3.961 0 0 0 1.937-.905c0 .05.05.05.1.05a3.629 3.629 0 0 1-.428 1.132c.003.05-.048.152.053.202Zm2.817 3.57c.251-.1.4-.276.629-.376-.05.05-.05.15-.1.2a3.699 3.699 0 0 0-.528.4 15.965 15.965 0 0 0-1.585 1.61c-.252.3-.528.578-.8.855-.096.09-.2.172-.31.245l-2.527-1.45c.36.03.721.013 1.076-.053.294-.083.58-.192.855-.327v.1c.7-.277 1.232-.906 1.937-1.132.025 0 .126.1.226.05a1.883 1.883 0 0 1 1.509-.7c0 .05 0 .1.05.1h.025c-.151.126-.327.25-.5.377-.057.052-.007.102.043.102Zm-8.908-6.163v-.186a5.817 5.817 0 0 1 1.588-.188 1.52 1.52 0 0 1 .478 0 5.86 5.86 0 0 0-2.066.374Zm30.6 5.088a.665.665 0 0 1-.306.524l-10.079 5.85a32.296 32.296 0 0 1-3.408-1.184 2.826 2.826 0 0 1-.05-2.245c.08-.308.198-.605.352-.883.025-.025.05-.05.05-.076a.025.025 0 0 0 .025-.025 4.32 4.32 0 0 1 .377-.555l.015-.015.02-.021.015-.015c0-.025.025-.05.05-.076.025-.051.075-.076.1-.126.176-.186.37-.354.579-.5.213-.077.431-.136.654-.177.811.06 1.617.17 2.415.328a.752.752 0 0 1 .277.1c.301.059.612.041.905-.05a1.137 1.137 0 0 0 .855-.706 1.212 1.212 0 0 0 .05-1.06c-.178-.275-.013-.436.181-.59l.068-.054c.086-.061.164-.134.231-.216.126-.252-.1-.4-.151-.63-.05-.1-.226-.05-.327-.2.352-.151.855-.43.629-.857-.151-.227-.377-.63-.1-.857.352-.2.855-.151 1.006-.48a1.137 1.137 0 0 0-.292-1.084l-.075-.108a4.754 4.754 0 0 1-.211-.32 6.905 6.905 0 0 0-.528-.757 4.297 4.297 0 0 1-.528-1.01c-.151-.377.05-.705.05-1.083a6.347 6.347 0 0 0-.327-2.144c-.126-.353-.176-.731-.327-1.06a1.12 1.12 0 0 0-.226-.58.374.374 0 0 1 0-.327c.205-.145.399-.305.579-.48a.567.567 0 0 0-.2-.705c-.327-.151-.3.328-.528.429h-.151c-.05-.126.05-.177.151-.277 0-.05 0-.151-.05-.151-.2 0-.377-.051-.428-.151a3.957 3.957 0 0 0-1.861-1.286c.188.058.382.091.579.1.338.071.69.036 1.006-.1.227-.076.277-.48.377-.706a.8.8 0 0 0-.151-.631 2.19 2.19 0 0 0-.906-.756 9.13 9.13 0 0 1-.679-.353.956.956 0 0 0-.251-.126c-2.965-1.485-9.069-.2-9.534 0h-.009a8.254 8.254 0 0 0-1.249.475 3.922 3.922 0 0 0-2.365 2.465 3.83 3.83 0 0 0-1.333 1.509c-.428.8-1.056 1.509-.956 2.414.1.78.277 1.484.428 2.289.043.272.11.54.2.8.1.276 0 .629.151.855.075.15.025.327.227.428v.2c.05.05.05.1.151.1v.2c.435.423.807.906 1.107 1.434.1.276-.478.15-.7.05a5.977 5.977 0 0 1-1.132-.956.176.176 0 0 0-.051.1c.2.352.906.78.528 1.006-.2.1-.428-.151-.629.05-.05.076 0 .177 0 .277-.277-.2-.578-.1-.855-.2-.2-.05-.252-.427-.478-.427a15.191 15.191 0 0 0-1.811-.327 15.144 15.144 0 0 0-1.739-.16V19.707a.606.606 0 0 1 .306-.524l14.987-8.761 14.994 8.677a.605.605 0 0 1 .306.524v16.932Zm-7.954-8.261a.325.325 0 0 1-.282.149 2.84 2.84 0 0 0-.282.273c.1 0 0 .149.1.149-.205.223.077.694-.205.793-.37.099-.758.099-1.127 0a.727.727 0 0 1 .167-.016h.085a.382.382 0 0 0 .337-.132v-.2c0-.05-.051-.05-.1-.05a.16.16 0 0 1-.1.05.223.223 0 0 0-.154-.2.806.806 0 0 1-.718-.273.67.67 0 0 1 .436-.05c.128 0 .077-.223.231-.322h.154c.307-.372.871-.471.974-.843 0-.1-.282-.1-.487-.15a2.26 2.26 0 0 0-.82.05c-.36.05-.712.142-1.051.274.28-.206.592-.365.923-.471.232-.09.473-.157.718-.2l.132-.026.133-.027a.97.97 0 0 1 .556 0c.231.1.615.1.666.248.1.273-.154.545-.435.744-.057.08.149.135.149.23Z'/><rect width='29.56' height='13.302' x='37' y='5' fill='#FCC63A' rx='2'/><path fill='#161616' d='M39.562 16.168V7.316h2.921c.97 0 1.732.236 2.289.708.565.472.847 1.117.847 1.935 0 .81-.282 1.45-.847 1.922-.557.472-1.32.708-2.289.708h-1.125v3.579h-1.796Zm2.997-7.322h-1.201v2.213h1.2c.38 0 .675-.097.886-.29.22-.195.329-.473.329-.836 0-.337-.11-.602-.329-.796-.21-.194-.506-.291-.885-.291ZM47.23 16.168V7.316h2.707c.97 0 1.736.236 2.301.708.565.472.847 1.117.847 1.935 0 .53-.126.995-.379 1.39-.244.389-.59.688-1.037.899l2.782 3.92h-2.15l-2.352-3.579h-.923v3.579h-1.795Zm2.808-7.322h-1.012v2.213h1.012c.38 0 .674-.097.885-.29.21-.195.316-.473.316-.836 0-.337-.105-.602-.316-.796-.21-.194-.506-.291-.885-.291ZM59.549 7.063c.69 0 1.323.126 1.896.38.582.252 1.08.59 1.492 1.011.414.421.734.919.962 1.492.227.565.341 1.164.341 1.796 0 .632-.114 1.235-.341 1.808a4.485 4.485 0 0 1-.962 1.48c-.413.421-.91.758-1.492 1.011a4.648 4.648 0 0 1-1.896.38 4.738 4.738 0 0 1-3.402-1.391 4.484 4.484 0 0 1-.961-1.48 4.855 4.855 0 0 1-.342-1.808c0-.633.114-1.231.342-1.796.227-.573.548-1.07.961-1.492.413-.422.91-.759 1.492-1.012a4.737 4.737 0 0 1 1.91-.379Zm0 7.676a2.8 2.8 0 0 0 1.138-.228c.354-.16.653-.37.898-.632.252-.27.45-.586.594-.949a3.27 3.27 0 0 0 .215-1.188 3.17 3.17 0 0 0-.215-1.176 2.791 2.791 0 0 0-.595-.949 2.548 2.548 0 0 0-.897-.632 2.673 2.673 0 0 0-1.138-.24c-.413 0-.797.08-1.151.24a2.678 2.678 0 0 0-.91.632 2.899 2.899 0 0 0-.582.949 3.17 3.17 0 0 0-.215 1.176c0 .421.071.817.215 1.188.143.363.337.679.581.949.253.261.557.472.91.632.355.152.739.228 1.152.228Z'/></svg>"); + background-position: 50% 50%; + background-repeat: no-repeat; + width: 214px; + height: 56px; + border: none; + cursor: pointer !important; +} + +.proconnect-button:hover { + background-image: url("data:image/svg+xml;base64,<svg xmlns='http://www.w3.org/2000/svg' width='211' height='58' fill='none'><g clip-path='url(#a)'><path fill='#1212FF' d='M211 0H0v58h211V0Z'/><path fill='#fff' d='m69.986 26.368 1.156-1.071c.833 1.054 1.819 1.598 2.941 1.598 1.292 0 2.04-.816 2.04-1.904 0-2.55-5.627-2.244-5.627-6.035 0-1.734 1.428-3.196 3.451-3.196 1.683 0 2.907.765 3.791 1.938l-1.19 1.037c-.697-1.003-1.547-1.547-2.584-1.547-1.105 0-1.836.748-1.836 1.734 0 2.567 5.627 2.244 5.627 6.052 0 2.023-1.581 3.349-3.655 3.349-1.768 0-3.077-.663-4.114-1.955Zm10.817-5.712H79.46l1.445-4.556h1.649l-1.751 4.556Zm4.818-3.451c-.56 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM84.891 28v-8.568h1.444V28H84.89Zm3.767-4.284c0-2.499 1.717-4.624 4.403-4.624 1.241 0 2.261.459 3.043 1.292V15.25h1.445V28h-1.445v-.952c-.782.833-1.802 1.292-3.043 1.292-2.686 0-4.403-2.125-4.403-4.624Zm1.53 0c0 1.819 1.224 3.264 3.043 3.264 1.19 0 2.21-.578 2.873-1.598V22.05c-.68-1.037-1.7-1.598-2.873-1.598-1.819 0-3.043 1.445-3.043 3.264Zm18.023 2.873c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM110.473 28v-8.568h1.445v.969c.697-.765 1.581-1.309 2.856-1.309 1.921 0 3.349 1.292 3.349 3.723V28h-1.462v-5.134c0-1.53-.85-2.414-2.176-2.414-1.241 0-2.023.714-2.567 1.615V28h-1.445Zm11.052-2.873v-4.369h-1.615v-1.326h1.615V17.29h1.462v2.142h2.975v1.326h-2.975v4.369c0 1.343.68 1.717 1.717 1.717.561 0 .952-.068 1.275-.204v1.292c-.408.17-.867.238-1.479.238-1.904 0-2.975-.952-2.975-3.043Zm7.377-7.922c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM128.171 28v-8.568h1.445V28h-1.445Zm3.377-8.568h1.615v-1.054c0-1.836 1.207-3.128 3.043-3.128.952 0 1.7.34 2.21.833l-.901 1.054a1.633 1.633 0 0 0-1.292-.578c-.935 0-1.598.68-1.598 1.785v1.088h2.975v1.326h-2.975V28h-1.462v-7.242h-1.615v-1.326Zm8.543-2.227c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM139.36 28v-8.568h1.445V28h-1.445Zm12.115-1.411c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM153.737 28v-8.568h1.445v1.071c.629-.748 1.411-1.241 2.499-1.241.272 0 .527.034.731.102v1.496a3.105 3.105 0 0 0-.85-.119c-1.122 0-1.853.578-2.38 1.445V28h-1.445Zm13.685.34c-1.683 0-2.822-.952-2.822-2.448 0-1.326.986-2.278 2.822-2.567l2.873-.476v-.595c0-1.19-.85-1.87-2.057-1.87-1.003 0-1.836.442-2.329 1.19l-1.088-.833c.748-1.02 1.955-1.649 3.451-1.649 2.176 0 3.468 1.275 3.468 3.162V28h-1.445v-1.088c-.646.901-1.717 1.428-2.873 1.428Zm-1.377-2.499c0 .731.629 1.292 1.615 1.292 1.139 0 2.04-.595 2.635-1.581V23.92l-2.533.442c-1.19.187-1.717.731-1.717 1.479Zm7.252-6.409h1.564l2.737 7.055 2.737-7.055h1.564L178.55 28h-1.904l-3.349-8.568Zm17.856 7.157c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261Zm10.185 6.647c1.054 0 1.904-.51 2.431-1.275l1.156.884c-.799 1.071-2.04 1.751-3.604 1.751-2.839 0-4.658-2.125-4.658-4.624 0-2.499 1.819-4.624 4.658-4.624 1.547 0 2.805.697 3.604 1.751l-1.156.884a2.925 2.925 0 0 0-2.448-1.275c-1.836 0-3.145 1.445-3.145 3.264 0 1.836 1.309 3.264 3.162 3.264ZM70.854 45V32.4h4.158c2.772 0 4.464 1.422 4.464 3.762 0 2.322-1.692 3.744-4.464 3.744H73.41V45h-2.556Zm4.266-10.422h-1.71v3.15h1.71c1.08 0 1.728-.576 1.728-1.602 0-.954-.648-1.548-1.728-1.548ZM81.249 45v-9.072h2.286v.9c.594-.612 1.368-1.08 2.394-1.08.306 0 .576.054.792.126v2.394a3.938 3.938 0 0 0-1.008-.126c-1.116 0-1.836.612-2.178 1.17V45h-2.286Zm11.386-9.432c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm13.172-.234c1.44 0 2.574-.702 3.294-1.728l2.016 1.548c-1.152 1.566-3.024 2.574-5.31 2.574-3.978 0-6.696-3.06-6.696-6.66s2.718-6.66 6.696-6.66c2.286 0 4.158 1.026 5.31 2.556l-2.016 1.566c-.72-1.026-1.854-1.728-3.294-1.728-2.376 0-4.068 1.854-4.068 4.266s1.692 4.266 4.068 4.266Zm11.366-7.398c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm7.018 1.8v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm11.091 0v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm19.444-1.476c-.846 1.134-2.25 1.836-3.96 1.836-3.222 0-5.04-2.25-5.04-4.896 0-2.682 1.692-4.896 4.662-4.896 2.52 0 4.176 1.692 4.176 4.068 0 .504-.072.99-.144 1.296h-6.354c.144 1.494 1.188 2.376 2.736 2.376.99 0 1.8-.432 2.286-1.08l1.638 1.296Zm-4.338-6.048c-1.116 0-1.872.54-2.178 1.728h4.086c-.036-.9-.702-1.728-1.908-1.728Zm10.696 5.724c.882 0 1.584-.432 2.016-1.062l1.818 1.386c-.846 1.116-2.178 1.836-3.834 1.836-3.132 0-5.004-2.25-5.004-4.896s1.872-4.896 5.004-4.896c1.656 0 2.988.72 3.834 1.836l-1.818 1.386c-.432-.63-1.116-1.062-2.052-1.062-1.494 0-2.592 1.152-2.592 2.736 0 1.602 1.098 2.736 2.628 2.736Zm6.204-1.512v-3.672h-1.692v-2.088h1.692V33.66h2.304v2.268h2.772v2.088h-2.772v3.672c0 1.008.54 1.404 1.44 1.404.63 0 1.044-.072 1.35-.198v1.998c-.45.198-.99.288-1.746.288-2.268 0-3.348-1.278-3.348-3.492Z'/><path fill='#000091' d='M46.992 19.098 31.998 10.42l-14.994 8.76a.606.606 0 0 0-.306.525v16.948a.666.666 0 0 0 .306.524l14.992 8.6 14.994-8.706a.666.666 0 0 0 .306-.524V19.626a.604.604 0 0 0-.304-.528Z'/><path fill='#FCC63A' d='m26.641 19.598-5.029 8.628-4.557-9.175 5.39-3.113 4.489 3.16-.293.5Zm20.656 16.98V19.62a.6.6 0 0 0-.306-.523L31.998 10.42'/><path fill='#0063CB' d='M16.7 36.578 32 10.42v35.362l-14.996-8.605a.665.665 0 0 1-.306-.524V19.706l.002 16.872Zm24.669-20.735 5.458 3.155-4.489 9.15-5.387-9.236 4.418-3.07Z'/><path fill='#fff' d='m51.606 16.303-19.19-11.02a.933.933 0 0 0-.832 0l-19.19 11.02a.887.887 0 0 0-.394.695v22a.885.885 0 0 0 .394.7l19.189 11.02a.932.932 0 0 0 .832 0l19.191-11.02a.886.886 0 0 0 .394-.7v-22a.887.887 0 0 0-.394-.695ZM22.789 34.059h.079c-.042 0-.079.007-.079.05 0 .1.151 0 .2.1a.912.912 0 0 0-.629.276c0 .05.1.05.151.05-.075.1-.226.05-.277.152a.176.176 0 0 0 .1.05c-.05 0-.1 0-.1.05v.152c-.126 0-.176.1-.277.15.2.152.327 0 .528 0-.528.2-.956.479-1.484.63-.1 0 0 .15-.1.15.151.1.227-.05.377-.05-.654.378-1.333.7-2.037 1.133a.351.351 0 0 0-.1.2h-.2c-.1.05-.05.176-.151.277.226.15.5-.2.654 0 .05 0-.1.05-.2.05-.05 0-.05.1-.1.1h-.154c-.1.075-.2.126-.2.276a.22.22 0 0 0-.226.1 9.031 9.031 0 0 0 3.144-.578 7.683 7.683 0 0 0 2.088-1.56.176.176 0 0 1 .05.1c-.147.437-.43.816-.806 1.08-.277.152-.478.378-.7.479a4.057 4.057 0 0 0-.428.276c-.632.197-1.281.335-1.939.412l-.305.044c-.225.033-.449.069-.671.108l-1.993-1.138a.647.647 0 0 1-.288-.411.57.57 0 0 0 .094-.063.266.266 0 0 0-.113-.071v-.65a12.782 12.782 0 0 0 3.038-.942 8.746 8.746 0 0 0-3.037-1.343v-1.515a11.67 11.67 0 0 1 1.639.392 6.42 6.42 0 0 1 1.182.578c.147.14.307.267.478.377a.91.91 0 0 0 .8.05h.33a3.961 3.961 0 0 0 1.937-.905c0 .05.05.05.1.05a3.629 3.629 0 0 1-.428 1.132c.003.05-.048.152.053.202Zm2.817 3.57c.251-.1.4-.276.629-.376-.05.05-.05.15-.1.2a3.699 3.699 0 0 0-.528.4 15.965 15.965 0 0 0-1.585 1.61c-.252.3-.528.578-.8.855-.096.09-.2.172-.31.245l-2.527-1.45c.36.03.721.013 1.076-.053.294-.083.58-.192.855-.327v.1c.7-.277 1.232-.906 1.937-1.132.025 0 .126.1.226.05a1.883 1.883 0 0 1 1.509-.7c0 .05 0 .1.05.1h.025c-.151.126-.327.25-.5.377-.057.052-.007.102.043.102Zm-8.908-6.163v-.186a5.817 5.817 0 0 1 1.588-.188 1.52 1.52 0 0 1 .478 0 5.86 5.86 0 0 0-2.066.374Zm30.6 5.088a.665.665 0 0 1-.306.524l-10.079 5.85a32.296 32.296 0 0 1-3.408-1.184 2.826 2.826 0 0 1-.05-2.245c.08-.308.198-.605.352-.883.025-.025.05-.05.05-.076a.025.025 0 0 0 .025-.025 4.32 4.32 0 0 1 .377-.555l.015-.015.02-.021.015-.015c0-.025.025-.05.05-.076.025-.051.075-.076.1-.126.176-.186.37-.354.579-.5.213-.077.431-.136.654-.177.811.06 1.617.17 2.415.328a.752.752 0 0 1 .277.1c.301.059.612.041.905-.05a1.137 1.137 0 0 0 .855-.706 1.212 1.212 0 0 0 .05-1.06c-.178-.275-.013-.436.181-.59l.068-.054c.086-.061.164-.134.231-.216.126-.252-.1-.4-.151-.63-.05-.1-.226-.05-.327-.2.352-.151.855-.43.629-.857-.151-.227-.377-.63-.1-.857.352-.2.855-.151 1.006-.48a1.137 1.137 0 0 0-.292-1.084l-.075-.108a4.754 4.754 0 0 1-.211-.32 6.905 6.905 0 0 0-.528-.757 4.297 4.297 0 0 1-.528-1.01c-.151-.377.05-.705.05-1.083a6.347 6.347 0 0 0-.327-2.144c-.126-.353-.176-.731-.327-1.06a1.12 1.12 0 0 0-.226-.58.374.374 0 0 1 0-.327c.205-.145.399-.305.579-.48a.567.567 0 0 0-.2-.705c-.327-.151-.3.328-.528.429h-.151c-.05-.126.05-.177.151-.277 0-.05 0-.151-.05-.151-.2 0-.377-.051-.428-.151a3.957 3.957 0 0 0-1.861-1.286c.188.058.382.091.579.1.338.071.69.036 1.006-.1.227-.076.277-.48.377-.706a.8.8 0 0 0-.151-.631 2.19 2.19 0 0 0-.906-.756 9.13 9.13 0 0 1-.679-.353.956.956 0 0 0-.251-.126c-2.965-1.485-9.069-.2-9.534 0h-.009a8.254 8.254 0 0 0-1.249.475 3.922 3.922 0 0 0-2.365 2.465 3.83 3.83 0 0 0-1.333 1.509c-.428.8-1.056 1.509-.956 2.414.1.78.277 1.484.428 2.289.043.272.11.54.2.8.1.276 0 .629.151.855.075.15.025.327.227.428v.2c.05.05.05.1.151.1v.2c.435.423.807.906 1.107 1.434.1.276-.478.15-.7.05a5.977 5.977 0 0 1-1.132-.956.176.176 0 0 0-.051.1c.2.352.906.78.528 1.006-.2.1-.428-.151-.629.05-.05.076 0 .177 0 .277-.277-.2-.578-.1-.855-.2-.2-.05-.252-.427-.478-.427a15.191 15.191 0 0 0-1.811-.327 15.144 15.144 0 0 0-1.739-.16V19.707a.606.606 0 0 1 .306-.524l14.987-8.761 14.994 8.677a.605.605 0 0 1 .306.524v16.932Zm-7.954-8.261a.325.325 0 0 1-.282.149 2.84 2.84 0 0 0-.282.273c.1 0 0 .149.1.149-.205.223.077.694-.205.793-.37.099-.758.099-1.127 0a.727.727 0 0 1 .167-.016h.085a.382.382 0 0 0 .337-.132v-.2c0-.05-.051-.05-.1-.05a.16.16 0 0 1-.1.05.223.223 0 0 0-.154-.2.806.806 0 0 1-.718-.273.67.67 0 0 1 .436-.05c.128 0 .077-.223.231-.322h.154c.307-.372.871-.471.974-.843 0-.1-.282-.1-.487-.15a2.26 2.26 0 0 0-.82.05c-.36.05-.712.142-1.051.274.28-.206.592-.365.923-.471.232-.09.473-.157.718-.2l.132-.026.133-.027a.97.97 0 0 1 .556 0c.231.1.615.1.666.248.1.273-.154.545-.435.744-.057.08.149.135.149.23Z'/><path fill='#FCC63A' d='M64.56 5H39a2 2 0 0 0-2 2v9.302a2 2 0 0 0 2 2h25.56a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2Z'/><path fill='#161616' d='M39.562 16.168V7.316h2.921c.97 0 1.732.236 2.289.708.565.472.847 1.117.847 1.935 0 .81-.282 1.45-.847 1.922-.557.472-1.32.708-2.289.708h-1.125v3.579h-1.796Zm2.997-7.322h-1.201v2.213h1.2c.38 0 .675-.097.886-.29.22-.195.329-.473.329-.836 0-.337-.11-.602-.329-.796-.21-.194-.506-.291-.885-.291ZM47.23 16.168V7.316h2.707c.97 0 1.736.236 2.301.708.565.472.847 1.117.847 1.935 0 .53-.126.995-.379 1.39-.244.389-.59.688-1.037.899l2.782 3.92h-2.15l-2.352-3.579h-.923v3.579h-1.795Zm2.808-7.322h-1.012v2.213h1.012c.38 0 .674-.097.885-.29.21-.195.316-.473.316-.836 0-.337-.105-.602-.316-.796-.21-.194-.506-.291-.885-.291ZM59.549 7.063c.69 0 1.323.126 1.896.38.582.252 1.08.59 1.492 1.011.414.421.734.919.962 1.492.227.565.341 1.164.341 1.796 0 .632-.114 1.235-.341 1.808a4.485 4.485 0 0 1-.962 1.48c-.413.421-.91.758-1.492 1.011a4.648 4.648 0 0 1-1.896.38 4.738 4.738 0 0 1-3.402-1.391 4.484 4.484 0 0 1-.961-1.48 4.855 4.855 0 0 1-.342-1.808c0-.633.114-1.231.342-1.796.227-.573.548-1.07.961-1.492.413-.422.91-.759 1.492-1.012a4.737 4.737 0 0 1 1.91-.379Zm0 7.676a2.8 2.8 0 0 0 1.138-.228c.354-.16.653-.37.898-.632.252-.27.45-.586.594-.949a3.27 3.27 0 0 0 .215-1.188 3.17 3.17 0 0 0-.215-1.176 2.791 2.791 0 0 0-.595-.949 2.548 2.548 0 0 0-.897-.632 2.673 2.673 0 0 0-1.138-.24c-.413 0-.797.08-1.151.24a2.678 2.678 0 0 0-.91.632 2.899 2.899 0 0 0-.582.949 3.17 3.17 0 0 0-.215 1.176c0 .421.071.817.215 1.188.143.363.337.679.581.949.253.261.557.472.91.632.355.152.739.228 1.152.228Z'/></g><defs><clipPath id='a'><path fill='#fff' d='M0 0h211v58H0z'/></clipPath></defs></svg>"); +} \ No newline at end of file From aaecd2cee28eef45f1492f37dfb748ec168990bf Mon Sep 17 00:00:00 2001 From: Alessandro Mosca Date: Sat, 11 Apr 2026 15:11:40 +0200 Subject: [PATCH 2/9] poc: first draft of oauth2-proxy with ProConnect --- .env.example | 13 ++++ .gitignore | 2 + ...n-is-being-continued-from-a-previous-c.txt | 0 api/endpoints/auth.py | 2 +- api/utils/variables.py | 1 + compose.example.yml | 41 +++++++++- playground/app/app.py | 46 +++++++++++- .../app/features/auth/components/forms.py | 1 + playground/app/features/auth/state.py | 75 +++++++++++++++++++ playground/nginx.conf | 3 + 10 files changed, 180 insertions(+), 4 deletions(-) create mode 100644 2026-04-10-181443-this-session-is-being-continued-from-a-previous-c.txt diff --git a/.env.example b/.env.example index 22404bd8e..b3f525c83 100644 --- a/.env.example +++ b/.env.example @@ -20,3 +20,16 @@ ELASTICSEARCH_HOST=elasticsearch ELASTICSEARCH_PORT=9200 ELASTICSEARCH_USER=elasticsearch ELASTICSEARCH_PASSWORD=changeme + +# ProConnect / OAuth2-proxy +# Récupérer client_id et client_secret sur le portail partenaires ProConnect +# Intégration : https://partenaires.moncomptepro.beta.gouv.fr/ +PROCONNECT_CLIENT_ID= +PROCONNECT_CLIENT_SECRET= +# Générer avec : openssl rand -base64 32 +OAUTH2_PROXY_COOKIE_SECRET= +OAUTH2_PROXY_PORT=4180 +# URL publique du playground (celle que voit le navigateur) +# En local avec ProConnect : http://localhost:4180 (défaut) +# En production : https://albert.playground +# PLAYGROUND_PUBLIC_URL=https://albert.playground diff --git a/.gitignore b/.gitignore index ebd0767ba..82eb0eb0f 100644 --- a/.gitignore +++ b/.gitignore @@ -221,3 +221,5 @@ docs/.astro docs/node_modules docs/.cache docs/package-lock.json +oauth2-proxy.cfg +oauth2-proxy.example.cfg \ No newline at end of file diff --git a/2026-04-10-181443-this-session-is-being-continued-from-a-previous-c.txt b/2026-04-10-181443-this-session-is-being-continued-from-a-previous-c.txt new file mode 100644 index 000000000..e69de29bb diff --git a/api/endpoints/auth.py b/api/endpoints/auth.py index 9f0927e03..508ffbafe 100644 --- a/api/endpoints/auth.py +++ b/api/endpoints/auth.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter, Depends, Request +from fastapi import APIRouter, Depends, HTTPException, Request from fastapi.responses import JSONResponse from sqlalchemy.ext.asyncio import AsyncSession diff --git a/api/utils/variables.py b/api/utils/variables.py index 876e284e0..2f96b80ff 100644 --- a/api/utils/variables.py +++ b/api/utils/variables.py @@ -45,6 +45,7 @@ class EndpointRoute(StrEnum): ADMIN_USERS = f"/{RouterName.ADMIN}/users" AUDIO_TRANSCRIPTIONS = f"/{RouterName.AUDIO}/transcriptions" AUTH_LOGIN = f"/{RouterName.AUTH}/login" + AUTH_PROCONNECT = f"/{RouterName.AUTH}/proconnect" CHAT_COMPLETIONS = f"/{RouterName.CHAT}/completions" CHUNKS = f"/{RouterName.CHUNKS}" COLLECTIONS = f"/{RouterName.COLLECTIONS}" diff --git a/compose.example.yml b/compose.example.yml index 8119bb18f..99c7dca4f 100644 --- a/compose.example.yml +++ b/compose.example.yml @@ -2,7 +2,11 @@ name: opengatellm services: api: - image: ghcr.io/etalab-ia/opengatellm/api:0.4.2 + build: + context: . + dockerfile: api/Dockerfile +# Should be the next release image +# image: ghcr.io/etalab-ia/opengatellm/api:0.4.2 restart: always env_file: .env ports: @@ -18,7 +22,14 @@ services: condition: service_healthy playground: - image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 + build: + context: . + dockerfile: playground/Dockerfile + args: + - REFLEX_BACKEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} + - REFLEX_FRONTEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} + # Should be the next release image +# image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 environment: - "OPENGATELLM_URL=${OPENGATELLM_URL:-http://api:8000}" - "REDIS_HOST=redis" @@ -27,12 +38,38 @@ services: - "${PLAYGROUND_PORT:-8501}:8501" volumes: - "./${CONFIG_FILE:-config.yml}:/config.yml:ro" + healthcheck: + test: [ "CMD-SHELL", "curl -sf http://localhost:8501/ping || exit 1" ] + interval: 5s + timeout: 5s + retries: 10 + start_period: 30s depends_on: redis: condition: service_healthy postgres: condition: service_healthy + # OAuth2-proxy : point d'entrée pour l'authentification ProConnect (OIDC) + # Proxifie vers le playground après authentification. + # Accès : http://localhost:${OAUTH2_PROXY_PORT:-4180} + # Pour l'activer : docker compose --profile proconnect up + oauth2-proxy: + image: quay.io/oauth2-proxy/oauth2-proxy:v7.8.1 + profiles: ["proconnect"] + command: --config /oauth2-proxy.cfg + ports: + - "${OAUTH2_PROXY_PORT:-4180}:4180" + volumes: + - "./oauth2-proxy.cfg:/oauth2-proxy.cfg:ro" + environment: + - "OAUTH2_PROXY_CLIENT_ID=${PROCONNECT_CLIENT_ID}" + - "OAUTH2_PROXY_CLIENT_SECRET=${PROCONNECT_CLIENT_SECRET}" + - "OAUTH2_PROXY_COOKIE_SECRET=${OAUTH2_PROXY_COOKIE_SECRET}" + depends_on: + playground: + condition: service_healthy + postgres: image: postgres:16.5 restart: always diff --git a/playground/app/app.py b/playground/app/app.py index 70a0713f8..f60e5a3ae 100644 --- a/playground/app/app.py +++ b/playground/app/app.py @@ -21,6 +21,8 @@ from app.shared.components.page import access_denied_page from app.shared.layouts.authenticated import authenticated_page +import requests +from fastapi import Request, HTTPException def index() -> rx.Component: """Chat page.""" @@ -119,6 +121,47 @@ def providers() -> rx.Component: ) ) +async def login_proconnect(self, postgres_session: AsyncSession, email: str) -> tuple[int, str]: + """ + Login a user authenticated via ProConnect (OIDC) and return a refreshed playground token. + The user must already exist in the database (no auto-provisioning). + Raises UserNotFoundException (404) if the user has not been provisioned by an admin. + + Args: + postgres_session(AsyncSession): Database session + email(str): User email asserted by the OIDC provider (injected by oauth2-proxy via X-Auth-Request-Email header) + + Returns: + Tuple containing the token ID and the playground token. + """ + user = await self.get_user(postgres_session=postgres_session, email=email) + if user is None: + raise UserNotFoundException() + + token_id, token = await self.refresh_token(postgres_session, user_id=user.id, name=self.PLAYGROUND_KEY_NAME) + return token_id, token + +fastapi_app = FastAPI(title="My API") + +# Add routes to the FastAPI app +@fastapi_app.get("/api/items") +async def get_items(): + return dict(items=["Item1", "Item2", "Item3"]) + +@fastapi_app.post(path="/oauth2/authorize") +async def login_proconnect(request: Request) -> LoginResponse: + """ + Exchange ProConnect identity (injected by oauth2-proxy) for a playground API token. + The user email is read from the X-Auth-Request-Email header set by oauth2-proxy after a successful OIDC authentication. + The user must already exist in the database; no auto-provisioning is performed. + """ + email = request.headers.get("X-Auth-Request-Email") + if not email: + raise HTTPException(status_code=401, detail="Missing ProConnect authentication headers.") + + token_id, token = await global_context.identity_access_manager.login_proconnect(postgres_session=postgres_session, email=email) + + return JSONResponse(status_code=200, content=LoginResponse(id=token_id, key=token).model_dump()) # Create the app with theme configuration app = rx.App( @@ -133,10 +176,11 @@ def providers() -> rx.Component: scaling=configuration.settings.playground_theme_scaling, ), head_components=[rx.el.link(rel="icon", type="image/svg+xml", href="/favicon.svg")], + api_transformer=fastapi_app ) # Add pages -app.add_page(component=index, route="/") +app.add_page(component=index, route="/", on_load=[AuthState.login_proconnect]) app.add_page(component=account, route="/account") app.add_page(component=keys, route="/keys", on_load=[KeysState.load_entities]) app.add_page(component=usage, route="/usage", on_load=[UsageState.load_entities]) diff --git a/playground/app/features/auth/components/forms.py b/playground/app/features/auth/components/forms.py index b5cde16e6..9d70bc41a 100644 --- a/playground/app/features/auth/components/forms.py +++ b/playground/app/features/auth/components/forms.py @@ -83,6 +83,7 @@ def login_form() -> rx.Component: ), class_name="proconnect-button", type="button", + on_click=AuthState.login_proconnect, ), width="100%", ), diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index a29336df5..f112f0679 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -45,6 +45,81 @@ def set_password_input(self, value: str): """Set password input value.""" self.password_input = value + @rx.event + async def login_proconnect(self): + """Auto-login using the ProConnect identity injected by oauth2-proxy. + + Reads the X-Auth-Request-Email header forwarded by oauth2-proxy into the WebSocket + connection. If the header is present, calls POST /v1/auth/proconnect on the API + (no password required - the OIDC authentication already happened at the proxy level). + If the header is absent the user landed directly on the playground (port 8501) and + no action is taken - they can still log in with email/password. + """ + if self.is_authenticated: + return + + # oauth2-proxy injecte X-Forwarded-Email (via pass_user_headers=true) + # accessible via raw_headers (clés en minuscules avec tirets) + email = self.router.headers.raw_headers.get("x-forwarded-email") + if not email: + return + + self.is_loading = True + yield + + response = None + try: + async with httpx.AsyncClient() as client: + response = await client.post( + f"{self.opengatellm_url}/v1/auth/proconnect", + headers={"X-Auth-Request-Email": email}, + timeout=configuration.settings.playground_opengatellm_timeout, + ) + if response.status_code != 200: + error_detail = response.json().get("detail", "ProConnect login failed") + yield rx.toast.error(error_detail, position="bottom-right") + self.is_loading = False + yield + return + + login_data = response.json() + api_key = login_data.get("key") + api_key_id = login_data.get("id") + + response = await client.get( + f"{self.opengatellm_url}/v1/me/info", + headers={"Authorization": f"Bearer {api_key}"}, + timeout=configuration.settings.playground_opengatellm_timeout, + ) + + if response.status_code != 200: + yield rx.toast.error("Failed to fetch user info", position="bottom-right") + self.is_loading = False + yield + return + + user_data = response.json() + + self.is_authenticated = True + self.user_id = user_data.get("id") + self.user_email = user_data.get("email") + self.user_name = user_data.get("name") + self.api_key = api_key + self.api_key_id = api_key_id + self.user_organization = user_data.get("organization") + self.user_budget = user_data.get("budget") + self.user_priority = user_data.get("priority", 0) + self.user_created = user_data.get("created") + self.user_updated = user_data.get("updated") + self.user_permissions = user_data.get("permissions", []) + self.user_limits = user_data.get("limits", []) + + except Exception as e: + yield httpx_error_toast(exception=e, response=response) + finally: + self.is_loading = False + yield + @rx.event async def login_direct(self): """Handle login using direct state values.""" diff --git a/playground/nginx.conf b/playground/nginx.conf index 2bb19b2e8..e77018fca 100644 --- a/playground/nginx.conf +++ b/playground/nginx.conf @@ -20,6 +20,9 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; + # Forward ProConnect identity headers injected by oauth2-proxy + proxy_set_header X-Auth-Request-Email $http_x_auth_request_email; + proxy_set_header X-Auth-Request-User $http_x_auth_request_user; proxy_read_timeout 86400; } From c72c20fa622393553ebf26e0dc8ab8967e124ff0 Mon Sep 17 00:00:00 2001 From: leoguillaume Date: Wed, 15 Apr 2026 16:14:50 +0200 Subject: [PATCH 3/9] wip --- api/endpoints/auth.py | 2 +- compose.proconnect.yml | 125 ++++++++++++++++++++++++++ playground/app/app.py | 44 --------- playground/app/core/configuration.py | 2 + playground/app/features/auth/state.py | 43 +++++++-- 5 files changed, 163 insertions(+), 53 deletions(-) create mode 100644 compose.proconnect.yml diff --git a/api/endpoints/auth.py b/api/endpoints/auth.py index 508ffbafe..9f0927e03 100644 --- a/api/endpoints/auth.py +++ b/api/endpoints/auth.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter, Depends, HTTPException, Request +from fastapi import APIRouter, Depends, Request from fastapi.responses import JSONResponse from sqlalchemy.ext.asyncio import AsyncSession diff --git a/compose.proconnect.yml b/compose.proconnect.yml new file mode 100644 index 000000000..f22f40578 --- /dev/null +++ b/compose.proconnect.yml @@ -0,0 +1,125 @@ +name: opengatellm + +services: + api: + build: + context: . + dockerfile: api/Dockerfile +# Should be the next release image +# image: ghcr.io/etalab-ia/opengatellm/api:0.4.2 + restart: always + env_file: .env + ports: + - "${API_PORT:-8000}:8000" + volumes: + - "${CONFIG_FILE:-./config.yml}:/config.yml:ro" # outside the container, do not change this line + depends_on: + redis: + condition: service_healthy + postgres: + condition: service_healthy + elasticsearch: + condition: service_healthy + + playground: + build: + context: . + dockerfile: playground/Dockerfile + args: + - REFLEX_BACKEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} + - REFLEX_FRONTEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} + # Should be the next release image +# image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 + environment: + - "OPENGATELLM_URL=${OPENGATELLM_URL:-http://api:8000}" + - "REDIS_HOST=redis" + - "REDIS_PORT=${REDIS_PORT:-6379}" + ports: + - "${PLAYGROUND_PORT:-8501}:8501" + volumes: + - "./${CONFIG_FILE:-config.yml}:/config.yml:ro" + depends_on: + redis: + condition: service_healthy + postgres: + condition: service_healthy + + # OAuth2-proxy : point d'entrée pour l'authentification ProConnect (OIDC) + # Proxifie vers le playground après authentification. + # Accès : http://localhost:${OAUTH2_PROXY_PORT:-4180} + # Pour l'activer : docker compose --profile proconnect up + oauth2-proxy: + image: quay.io/oauth2-proxy/oauth2-proxy:v7.8.1 + profiles: ["proconnect"] + command: --config /oauth2-proxy.cfg + ports: + - "${OAUTH2_PROXY_PORT:-4180}:4180" + volumes: + - "./oauth2-proxy.cfg:/oauth2-proxy.cfg:ro" + environment: + - "OAUTH2_PROXY_CLIENT_ID=${PROCONNECT_CLIENT_ID}" + - "OAUTH2_PROXY_CLIENT_SECRET=${PROCONNECT_CLIENT_SECRET}" + - "OAUTH2_PROXY_COOKIE_SECRET=${OAUTH2_PROXY_COOKIE_SECRET}" + depends_on: + playground: + condition: service_healthy + + postgres: + image: postgres:16.5 + restart: always + user: postgres + environment: + - "POSTGRES_USER=${POSTGRES_USER:-postgres}" + - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-changeme}" + - "POSTGRES_DB=postgres" + ports: + - "${POSTGRES_PORT:-5432}:5432" + volumes: + - postgres:/var/lib/postgresql/data + healthcheck: + test: [ "CMD-SHELL", "pg_isready", "-U", "postgres" ] + interval: 4s + timeout: 10s + retries: 5 + start_period: 60s + + redis: + image: redis/redis-stack-server:7.4.0-v7 + restart: always + environment: + REDIS_ARGS: "--dir /data --requirepass ${REDIS_PASSWORD:-changeme} --user ${REDIS_USER:-redis} on >password ~* allcommands --save 60 1 --appendonly yes" + ports: + - "${REDIS_PORT:-6379}:6379" + volumes: + - redis:/data + healthcheck: + test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] + interval: 4s + timeout: 10s + retries: 5 + start_period: 60s + + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:9.0.2 + restart: always + ports: + - "${ELASTICSEARCH_PORT:-9200}:9200" + environment: + - discovery.type=single-node + - xpack.security.enabled=false + - "ES_JAVA_OPTS=-Xms1g -Xmx1g" + - "ELASTIC_USERNAME=elasticsearch" + - "ELASTIC_PASSWORD=changeme" + volumes: + - elasticsearch:/usr/share/elasticsearch/data + healthcheck: + test: [ "CMD-SHELL", "bash", "-c", ":> /dev/tcp/127.0.0.1/9200" ] + interval: 4s + timeout: 10s + retries: 5 + start_period: 60s + +volumes: + elasticsearch: + postgres: + redis: diff --git a/playground/app/app.py b/playground/app/app.py index f60e5a3ae..5e0db39b6 100644 --- a/playground/app/app.py +++ b/playground/app/app.py @@ -21,8 +21,6 @@ from app.shared.components.page import access_denied_page from app.shared.layouts.authenticated import authenticated_page -import requests -from fastapi import Request, HTTPException def index() -> rx.Component: """Chat page.""" @@ -121,47 +119,6 @@ def providers() -> rx.Component: ) ) -async def login_proconnect(self, postgres_session: AsyncSession, email: str) -> tuple[int, str]: - """ - Login a user authenticated via ProConnect (OIDC) and return a refreshed playground token. - The user must already exist in the database (no auto-provisioning). - Raises UserNotFoundException (404) if the user has not been provisioned by an admin. - - Args: - postgres_session(AsyncSession): Database session - email(str): User email asserted by the OIDC provider (injected by oauth2-proxy via X-Auth-Request-Email header) - - Returns: - Tuple containing the token ID and the playground token. - """ - user = await self.get_user(postgres_session=postgres_session, email=email) - if user is None: - raise UserNotFoundException() - - token_id, token = await self.refresh_token(postgres_session, user_id=user.id, name=self.PLAYGROUND_KEY_NAME) - return token_id, token - -fastapi_app = FastAPI(title="My API") - -# Add routes to the FastAPI app -@fastapi_app.get("/api/items") -async def get_items(): - return dict(items=["Item1", "Item2", "Item3"]) - -@fastapi_app.post(path="/oauth2/authorize") -async def login_proconnect(request: Request) -> LoginResponse: - """ - Exchange ProConnect identity (injected by oauth2-proxy) for a playground API token. - The user email is read from the X-Auth-Request-Email header set by oauth2-proxy after a successful OIDC authentication. - The user must already exist in the database; no auto-provisioning is performed. - """ - email = request.headers.get("X-Auth-Request-Email") - if not email: - raise HTTPException(status_code=401, detail="Missing ProConnect authentication headers.") - - token_id, token = await global_context.identity_access_manager.login_proconnect(postgres_session=postgres_session, email=email) - - return JSONResponse(status_code=200, content=LoginResponse(id=token_id, key=token).model_dump()) # Create the app with theme configuration app = rx.App( @@ -176,7 +133,6 @@ async def login_proconnect(request: Request) -> LoginResponse: scaling=configuration.settings.playground_theme_scaling, ), head_components=[rx.el.link(rel="icon", type="image/svg+xml", href="/favicon.svg")], - api_transformer=fastapi_app ) # Add pages diff --git a/playground/app/core/configuration.py b/playground/app/core/configuration.py index ded20a3ab..faff13eb9 100644 --- a/playground/app/core/configuration.py +++ b/playground/app/core/configuration.py @@ -93,6 +93,8 @@ class Settings(ConfigBaseModel): playground_theme_radius: str = Field(default="medium", description="The radius of the theme. Can be 'small', 'medium', or 'large'.") playground_theme_scaling: str = Field(default="100%", description="The scaling of the theme.") + admin_api_key: str = Field(default="changeme", description="The API key to use to access the admin API.") + swagger_url: str | None = Field(default="http://localhost:8000/docs", pattern=r"^http[s]?://", description="Swagger URL. If not provided, deactivated swagger link in the navigation bar.") # fmt: off reference_url: str | None = Field(default="http://localhost:8000/redoc", pattern=r"^http[s]?://", description="Reference URL. If not provided, deactivated reference link in the navigation bar.") # fmt: off documentation_url: str | None = Field(default="https://docs.opengatellm.org", pattern=r"^http[s]?://", description="Documentation URL. If not provided, deactivated documentation link in the navigation bar.") # fmt: off diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index f112f0679..44dca1f5d 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -70,21 +70,48 @@ async def login_proconnect(self): response = None try: async with httpx.AsyncClient() as client: - response = await client.post( - f"{self.opengatellm_url}/v1/auth/proconnect", - headers={"X-Auth-Request-Email": email}, - timeout=configuration.settings.playground_opengatellm_timeout, + # response = await client.post( + # f"{self.opengatellm_url}/v1/auth/proconnect", + # headers={"X-Auth-Request-Email": email}, + # timeout=configuration.settings.playground_opengatellm_timeout, + # ) + import requests + + response = requests.post( + url="http://localhost:8000/v1/admin/users", + params={"email": email}, + headers={"Authorization": f"Bearer {configuration.settings.admin_api_key}"}, ) if response.status_code != 200: - error_detail = response.json().get("detail", "ProConnect login failed") + error_detail = response.json().get("detail", "Failed to fetch user info") yield rx.toast.error(error_detail, position="bottom-right") self.is_loading = False yield return - login_data = response.json() - api_key = login_data.get("key") - api_key_id = login_data.get("id") + user_info = response.json().get("data", [])[0] + + # TODO: support email as param to /v1/admin/tokens endpoint + response = requests.post( + url="http://api:8000/v1/admin/tokens", + json={"user": user_info.get("id"), "name": "playground"}, + headers={"Authorization": f"Bearer {configuration.settings.admin_api_key}"}, + ) + if response.status_code != 200: + error_detail = response.json().get("detail", "Failed to create token") + yield rx.toast.error(error_detail, position="bottom-right") + self.is_loading = False + yield + return + + api_key = response.json().get("token") + api_key_id = response.json().get("id") + if response.status_code != 200: + error_detail = response.json().get("detail", "ProConnect login failed") + yield rx.toast.error(error_detail, position="bottom-right") + self.is_loading = False + yield + return response = await client.get( f"{self.opengatellm_url}/v1/me/info", From 9812c6929f1aa18e0728bf0f88b737aa4b2620e1 Mon Sep 17 00:00:00 2001 From: leoguillaume Date: Wed, 15 Apr 2026 17:54:58 +0200 Subject: [PATCH 4/9] wip 2 --- compose.proconnect.yml | 7 ++++ config.example.yml | 3 +- playground/app/core/configuration.py | 4 +-- playground/app/features/auth/state.py | 50 +++++++++++++++++---------- 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/compose.proconnect.yml b/compose.proconnect.yml index f22f40578..d107fbb1d 100644 --- a/compose.proconnect.yml +++ b/compose.proconnect.yml @@ -32,12 +32,19 @@ services: # image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 environment: - "OPENGATELLM_URL=${OPENGATELLM_URL:-http://api:8000}" + - "PLAYGROUND_ADMIN_API_KEY=${PLAYGROUND_ADMIN_API_KEY}" - "REDIS_HOST=redis" - "REDIS_PORT=${REDIS_PORT:-6379}" ports: - "${PLAYGROUND_PORT:-8501}:8501" volumes: - "./${CONFIG_FILE:-config.yml}:/config.yml:ro" + healthcheck: + test: [ "CMD-SHELL", "curl -sf http://localhost:8501/ping || exit 1" ] + interval: 5s + timeout: 5s + retries: 10 + start_period: 30s depends_on: redis: condition: service_healthy diff --git a/config.example.yml b/config.example.yml index dbae1b78a..01d059007 100644 --- a/config.example.yml +++ b/config.example.yml @@ -41,7 +41,6 @@ dependencies: index_name: opengatellm index_language: english number_of_shards: 1 - index_name: "opengatellm" number_of_replicas: 0 hosts: "http://${ELASTICSEARCH_HOST:-localhost}:${ELASTICSEARCH_PORT:-9200}" basic_auth: @@ -85,6 +84,8 @@ settings: # search_multi_agents_reranker_model: my-model playground_opengatellm_url: ${OPENGATELLM_URL} + playground_admin_api_key: ${PLAYGROUND_ADMIN_API_KEY} + playground_default_role_id: 2 # playground_default_model: my-model # playground_theme_has_background: True # playground_theme_accent_color: purple diff --git a/playground/app/core/configuration.py b/playground/app/core/configuration.py index faff13eb9..371467dbb 100644 --- a/playground/app/core/configuration.py +++ b/playground/app/core/configuration.py @@ -83,6 +83,8 @@ class Settings(ConfigBaseModel): app_title: str = Field(default=DEFAULT_APP_NAME, description="The title of the application.") playground_opengatellm_url: str = Field(default="http://localhost:8000", description="The URL of the OpenGateLLM API.") + playground_admin_api_key: str = Field(description="The API key to use to access the admin API.") + playground_default_role_id: str | int = Field(description="The default role ID for new users.") playground_opengatellm_timeout: int = Field(default=60, description="The timeout in seconds for the OpenGateLLM API.") playground_default_model: str | None = Field(default=None, description="The first model selected in chat page.") playground_theme_has_background: bool = Field(default=True, description="Whether the theme has a background.") @@ -93,8 +95,6 @@ class Settings(ConfigBaseModel): playground_theme_radius: str = Field(default="medium", description="The radius of the theme. Can be 'small', 'medium', or 'large'.") playground_theme_scaling: str = Field(default="100%", description="The scaling of the theme.") - admin_api_key: str = Field(default="changeme", description="The API key to use to access the admin API.") - swagger_url: str | None = Field(default="http://localhost:8000/docs", pattern=r"^http[s]?://", description="Swagger URL. If not provided, deactivated swagger link in the navigation bar.") # fmt: off reference_url: str | None = Field(default="http://localhost:8000/redoc", pattern=r"^http[s]?://", description="Reference URL. If not provided, deactivated reference link in the navigation bar.") # fmt: off documentation_url: str | None = Field(default="https://docs.opengatellm.org", pattern=r"^http[s]?://", description="Documentation URL. If not provided, deactivated documentation link in the navigation bar.") # fmt: off diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index 44dca1f5d..41e55d681 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -30,6 +30,8 @@ class AuthState(rx.State): is_loading: bool = False opengatellm_url: str = configuration.settings.playground_opengatellm_url + admin_api_key: str = configuration.settings.playground_admin_api_key + default_role_id: int = int(configuration.settings.playground_default_role_id) # Form fields email_input: str = "" @@ -77,28 +79,46 @@ async def login_proconnect(self): # ) import requests - response = requests.post( - url="http://localhost:8000/v1/admin/users", - params={"email": email}, - headers={"Authorization": f"Bearer {configuration.settings.admin_api_key}"}, - ) - if response.status_code != 200: + url = f"{self.opengatellm_url}/v1/admin/users" + response = requests.get(url=url, params={"email": email}, headers={"Authorization": f"Bearer {self.admin_api_key}"}) + if response.status_code == 404: + # TODO: rendre le password optionnel + response = requests.post( + url=url, + json={"email": email, "name": email, "password": "changeme", "role": self.default_role_id}, + headers={"Authorization": f"Bearer {self.admin_api_key}"}, + ) + if response.status_code != 201: + error_detail = response.json().get("detail", "Failed to create user") + error_detail = f"Failed to create user: {error_detail}\nURL: {url}\nAPI Key: {self.admin_api_key}" + yield rx.toast.error(error_detail, position="bottom-right") + self.is_loading = False + yield + return + + user_id = response.json().get("id") + + elif response.status_code == 200: + user_id = response.json().get("data", [])[0]["id"] + else: error_detail = response.json().get("detail", "Failed to fetch user info") + error_detail = f"Failed to fetch user info: {error_detail}\nURL: {url}\nAPI Key: {self.admin_api_key}" + yield rx.toast.error(error_detail, position="bottom-right") self.is_loading = False yield return - user_info = response.json().get("data", [])[0] - # TODO: support email as param to /v1/admin/tokens endpoint + # TODO: add SSO expiration duration response = requests.post( - url="http://api:8000/v1/admin/tokens", - json={"user": user_info.get("id"), "name": "playground"}, - headers={"Authorization": f"Bearer {configuration.settings.admin_api_key}"}, + url=f"{self.opengatellm_url}/v1/admin/tokens", + json={"user": user_id, "name": "playground"}, + headers={"Authorization": f"Bearer {self.admin_api_key}"}, ) - if response.status_code != 200: + if response.status_code != 201: error_detail = response.json().get("detail", "Failed to create token") + error_detail = f"Failed to create token: {error_detail}\nURL: {url}\nAPI Key: {self.admin_api_key}" yield rx.toast.error(error_detail, position="bottom-right") self.is_loading = False yield @@ -106,12 +126,6 @@ async def login_proconnect(self): api_key = response.json().get("token") api_key_id = response.json().get("id") - if response.status_code != 200: - error_detail = response.json().get("detail", "ProConnect login failed") - yield rx.toast.error(error_detail, position="bottom-right") - self.is_loading = False - yield - return response = await client.get( f"{self.opengatellm_url}/v1/me/info", From b29e9e418ddac7d3ba7f52b3c06a922a5f274f86 Mon Sep 17 00:00:00 2001 From: leoguillaume Date: Wed, 15 Apr 2026 19:52:08 +0200 Subject: [PATCH 5/9] clean --- .env.example | 13 -- .gitignore | 2 +- ...n-is-being-continued-from-a-previous-c.txt | 0 api/domain/user/_userrepository.py | 2 +- api/endpoints/admin/tokens.py | 1 + api/helpers/_identityaccessmanager.py | 16 +- api/infrastructure/fastapi/schemas/users.py | 5 +- .../postgres/_postgresusersrepository.py | 2 +- api/schemas/admin/tokens.py | 17 +- api/schemas/core/configuration.py | 7 +- .../admin/users/_createuserusecase.py | 2 +- api/utils/variables.py | 1 - compose.example.yml | 37 +--- compose.proconnect.yml | 132 ------------ config.example.yml | 5 +- playground/app/app.py | 6 +- playground/app/core/configuration.py | 91 ++++++-- playground/app/features/account/state.py | 5 +- .../app/features/auth/components/forms.py | 36 +--- playground/app/features/auth/state.py | 201 +++++++----------- playground/app/features/chat/state.py | 6 +- playground/app/features/keys/state.py | 6 +- .../app/features/organizations/state.py | 9 +- playground/app/features/providers/state.py | 15 +- playground/app/features/roles/state.py | 29 ++- playground/app/features/routers/state.py | 31 ++- playground/app/features/usage/state.py | 23 +- playground/app/features/users/state.py | 13 +- playground/assets/proconnect.css | 26 --- 29 files changed, 257 insertions(+), 482 deletions(-) delete mode 100644 2026-04-10-181443-this-session-is-being-continued-from-a-previous-c.txt delete mode 100644 compose.proconnect.yml delete mode 100644 playground/assets/proconnect.css diff --git a/.env.example b/.env.example index b3f525c83..22404bd8e 100644 --- a/.env.example +++ b/.env.example @@ -20,16 +20,3 @@ ELASTICSEARCH_HOST=elasticsearch ELASTICSEARCH_PORT=9200 ELASTICSEARCH_USER=elasticsearch ELASTICSEARCH_PASSWORD=changeme - -# ProConnect / OAuth2-proxy -# Récupérer client_id et client_secret sur le portail partenaires ProConnect -# Intégration : https://partenaires.moncomptepro.beta.gouv.fr/ -PROCONNECT_CLIENT_ID= -PROCONNECT_CLIENT_SECRET= -# Générer avec : openssl rand -base64 32 -OAUTH2_PROXY_COOKIE_SECRET= -OAUTH2_PROXY_PORT=4180 -# URL publique du playground (celle que voit le navigateur) -# En local avec ProConnect : http://localhost:4180 (défaut) -# En production : https://albert.playground -# PLAYGROUND_PUBLIC_URL=https://albert.playground diff --git a/.gitignore b/.gitignore index 82eb0eb0f..52d0b8157 100644 --- a/.gitignore +++ b/.gitignore @@ -222,4 +222,4 @@ docs/node_modules docs/.cache docs/package-lock.json oauth2-proxy.cfg -oauth2-proxy.example.cfg \ No newline at end of file +compose.*.yml \ No newline at end of file diff --git a/2026-04-10-181443-this-session-is-being-continued-from-a-previous-c.txt b/2026-04-10-181443-this-session-is-being-continued-from-a-previous-c.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/api/domain/user/_userrepository.py b/api/domain/user/_userrepository.py index c805969b3..ee91d7aa8 100644 --- a/api/domain/user/_userrepository.py +++ b/api/domain/user/_userrepository.py @@ -14,8 +14,8 @@ async def has_admin_user(self) -> bool: async def create_user( self, email: str, - password: str, role_id: int, + password: str | None = None, name: str | None = None, sub: str | None = None, iss: str | None = None, diff --git a/api/endpoints/admin/tokens.py b/api/endpoints/admin/tokens.py index 9120c2560..e77ede739 100644 --- a/api/endpoints/admin/tokens.py +++ b/api/endpoints/admin/tokens.py @@ -31,6 +31,7 @@ async def create_token( token_id, token = await global_context.identity_access_manager.create_token( postgres_session=postgres_session, user_id=body.user, + email=body.email, name=body.name, expires=body.expires, ) diff --git a/api/helpers/_identityaccessmanager.py b/api/helpers/_identityaccessmanager.py index 0602e5f7d..eea2e3558 100644 --- a/api/helpers/_identityaccessmanager.py +++ b/api/helpers/_identityaccessmanager.py @@ -546,14 +546,24 @@ async def get_organizations( return organizations - async def create_token(self, postgres_session: AsyncSession, user_id: int, name: str, expires: int | None = None) -> tuple[int, str]: + async def create_token( + self, postgres_session: AsyncSession, name: str, expires: int | None = None, user_id: int | None = None, email: str | None = None + ) -> tuple[int, str]: + assert user_id is not None or email is not None, "user_id or email is required" + assert user_id is None or email is None, "user_id and email cannot be provided together" + if self.key_max_expiration_days: if expires is None: expires = int(dt.datetime.now(tz=dt.UTC).timestamp()) + self.key_max_expiration_days * 86400 elif expires > int(dt.datetime.now(tz=dt.UTC).timestamp()) + self.key_max_expiration_days * 86400: raise InvalidTokenExpirationException(detail=f"Token expiration timestamp cannot be greater than {self.key_max_expiration_days} days from now.") # fmt: off - result = await postgres_session.execute(statement=select(UserTable).where(UserTable.id == user_id)) + statement = select(UserTable) + if user_id is not None: + statement = statement.where(UserTable.id == user_id) + if email is not None: + statement = statement.where(UserTable.email == email) + result = await postgres_session.execute(statement=statement) try: user = result.scalar_one() except NoResultFound: @@ -600,7 +610,7 @@ async def refresh_token(self, postgres_session: AsyncSession, user_id: int, name expires = int((datetime.now() + timedelta(seconds=self.playground_session_duration)).timestamp()) # Create a new token - token_id, token = await self.create_token(postgres_session, user_id, name, expires=expires) + token_id, token = await self.create_token(postgres_session=postgres_session, user_id=user_id, name=name, expires=expires) return token_id, token diff --git a/api/infrastructure/fastapi/schemas/users.py b/api/infrastructure/fastapi/schemas/users.py index 6fac7d645..aa5db9e97 100644 --- a/api/infrastructure/fastapi/schemas/users.py +++ b/api/infrastructure/fastapi/schemas/users.py @@ -9,8 +9,8 @@ class CreateUserBody(BaseModel): email: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1), Field(..., description="The user email.")] name: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] | None = Field(default=None, description="The user name.") - password: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(..., description="The user password.") - role: int = Field(..., description="The role ID.") + password: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] | None = Field(default=None, description="The user password.") + role: int = Field(..., description="The role ID.") # @TODO: replace by role_id organization: int | None = Field(default=None, description="The organization ID.") budget: float | None = Field(default=None, description="The budget.") expires: int | None = Field(default=None, description="The expiration timestamp.") @@ -18,6 +18,7 @@ class CreateUserBody(BaseModel): @field_validator("expires", mode="before") def must_be_future(cls, expires): + # @TODO: replace by Pydantic FutureDatetime if isinstance(expires, int): if expires <= int(dt.datetime.now(tz=dt.UTC).timestamp()): raise ValueError("Wrong timestamp, must be in the future.") diff --git a/api/infrastructure/postgres/_postgresusersrepository.py b/api/infrastructure/postgres/_postgresusersrepository.py index 7c0f68211..c64daa61d 100644 --- a/api/infrastructure/postgres/_postgresusersrepository.py +++ b/api/infrastructure/postgres/_postgresusersrepository.py @@ -35,8 +35,8 @@ async def has_admin_user(self) -> bool: async def create_user( self, email: str, - password: str, role_id: int, + password: str | None = None, name: str | None = None, sub: str | None = None, iss: str | None = None, diff --git a/api/schemas/admin/tokens.py b/api/schemas/admin/tokens.py index a355f5f29..6c6445318 100644 --- a/api/schemas/admin/tokens.py +++ b/api/schemas/admin/tokens.py @@ -1,7 +1,7 @@ import datetime as dt from typing import Literal -from pydantic import Field, constr, field_validator +from pydantic import Field, constr, field_validator, model_validator from api.schemas import BaseModel @@ -12,18 +12,27 @@ class TokensResponse(BaseModel): class CreateToken(BaseModel): - name: constr(strip_whitespace=True, min_length=1) - user: int = Field(description="User ID to create the token for another user (by default, the current user). Required CREATE_USER permission.") # fmt: off - expires: int | None = Field(None, description="Timestamp in seconds") + name: constr(strip_whitespace=True, min_length=1) = Field(..., description="The name of the token.") + user: int | None = Field(None, description="User ID of the user to create the token for. Optional if email is provided.") + email: str | None = Field(None, description="Email of the user to create the token for. Optional if user is provided.") + expires: int | None = Field(None, description="Timestamp in seconds for the token expiration.") @field_validator("expires", mode="before") def must_be_future(cls, expires): + # @TODO: replace by Pydantic FutureDatetime if isinstance(expires, int): if expires <= int(dt.datetime.now(tz=dt.UTC).timestamp()): raise ValueError("Wrong timestamp, must be in the future.") return expires + @model_validator(mode="after") + def validate_user_or_email(self): + if self.user is None and self.email is None: + raise ValueError("Either user or email must be provided.") + + return self + class Token(BaseModel): object: Literal["token"] = "token" diff --git a/api/schemas/core/configuration.py b/api/schemas/core/configuration.py index 764d41b62..e02938deb 100644 --- a/api/schemas/core/configuration.py +++ b/api/schemas/core/configuration.py @@ -21,7 +21,8 @@ # utils ---------------------------------------------------------------------------------------------------------------------------------------------- -def custom_validation_error(url: str | None = None): +def custom_validation_error(suffix: str = ""): + # TODO: surcharge url pour playground """ Decorator to override Pydantic ValidationError to change error message. @@ -63,7 +64,7 @@ def resolve_model_for_error(model: type[BaseModel], loc: tuple[Any, ...]): break current_model = next_model - documentation_url = f"{base_url}#{current_model.__name__.lower()}" + documentation_url = f"{base_url}#{current_model.__name__.lower()}{suffix}" return documentation_url @@ -345,7 +346,7 @@ class Tokenizer(StrEnum): TIKTOKEN_O200K_BASE = "tiktoken_o200k_base" -@custom_validation_error(url="https://docs.opengatellm.org/configuration/configuration_file#settings") +@custom_validation_error() class Settings(ConfigBaseModel): """ General settings configuration fields. diff --git a/api/use_cases/admin/users/_createuserusecase.py b/api/use_cases/admin/users/_createuserusecase.py index 25e474156..9ad273916 100644 --- a/api/use_cases/admin/users/_createuserusecase.py +++ b/api/use_cases/admin/users/_createuserusecase.py @@ -11,8 +11,8 @@ class CreateUserCommand: user_id: int email: str - password: str role_id: int + password: str | None = None name: str | None = None organization_id: int | None = None budget: float | None = None diff --git a/api/utils/variables.py b/api/utils/variables.py index 2f96b80ff..876e284e0 100644 --- a/api/utils/variables.py +++ b/api/utils/variables.py @@ -45,7 +45,6 @@ class EndpointRoute(StrEnum): ADMIN_USERS = f"/{RouterName.ADMIN}/users" AUDIO_TRANSCRIPTIONS = f"/{RouterName.AUDIO}/transcriptions" AUTH_LOGIN = f"/{RouterName.AUTH}/login" - AUTH_PROCONNECT = f"/{RouterName.AUTH}/proconnect" CHAT_COMPLETIONS = f"/{RouterName.CHAT}/completions" CHUNKS = f"/{RouterName.CHUNKS}" COLLECTIONS = f"/{RouterName.COLLECTIONS}" diff --git a/compose.example.yml b/compose.example.yml index 99c7dca4f..66f3652a6 100644 --- a/compose.example.yml +++ b/compose.example.yml @@ -2,17 +2,13 @@ name: opengatellm services: api: - build: - context: . - dockerfile: api/Dockerfile -# Should be the next release image -# image: ghcr.io/etalab-ia/opengatellm/api:0.4.2 + image: ghcr.io/etalab-ia/opengatellm/api:0.4.2 restart: always env_file: .env ports: - "${API_PORT:-8000}:8000" volumes: - - "${CONFIG_FILE:-./config.yml}:/config.yml:ro" # outside the container, do not change this line + - "${CONFIG_FILE:-./config.yml}:/config.yml:ro" depends_on: redis: condition: service_healthy @@ -22,14 +18,7 @@ services: condition: service_healthy playground: - build: - context: . - dockerfile: playground/Dockerfile - args: - - REFLEX_BACKEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} - - REFLEX_FRONTEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} - # Should be the next release image -# image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 + image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 environment: - "OPENGATELLM_URL=${OPENGATELLM_URL:-http://api:8000}" - "REDIS_HOST=redis" @@ -50,26 +39,6 @@ services: postgres: condition: service_healthy - # OAuth2-proxy : point d'entrée pour l'authentification ProConnect (OIDC) - # Proxifie vers le playground après authentification. - # Accès : http://localhost:${OAUTH2_PROXY_PORT:-4180} - # Pour l'activer : docker compose --profile proconnect up - oauth2-proxy: - image: quay.io/oauth2-proxy/oauth2-proxy:v7.8.1 - profiles: ["proconnect"] - command: --config /oauth2-proxy.cfg - ports: - - "${OAUTH2_PROXY_PORT:-4180}:4180" - volumes: - - "./oauth2-proxy.cfg:/oauth2-proxy.cfg:ro" - environment: - - "OAUTH2_PROXY_CLIENT_ID=${PROCONNECT_CLIENT_ID}" - - "OAUTH2_PROXY_CLIENT_SECRET=${PROCONNECT_CLIENT_SECRET}" - - "OAUTH2_PROXY_COOKIE_SECRET=${OAUTH2_PROXY_COOKIE_SECRET}" - depends_on: - playground: - condition: service_healthy - postgres: image: postgres:16.5 restart: always diff --git a/compose.proconnect.yml b/compose.proconnect.yml deleted file mode 100644 index d107fbb1d..000000000 --- a/compose.proconnect.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: opengatellm - -services: - api: - build: - context: . - dockerfile: api/Dockerfile -# Should be the next release image -# image: ghcr.io/etalab-ia/opengatellm/api:0.4.2 - restart: always - env_file: .env - ports: - - "${API_PORT:-8000}:8000" - volumes: - - "${CONFIG_FILE:-./config.yml}:/config.yml:ro" # outside the container, do not change this line - depends_on: - redis: - condition: service_healthy - postgres: - condition: service_healthy - elasticsearch: - condition: service_healthy - - playground: - build: - context: . - dockerfile: playground/Dockerfile - args: - - REFLEX_BACKEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} - - REFLEX_FRONTEND_URL=${PLAYGROUND_PUBLIC_URL:-http://localhost:${OAUTH2_PROXY_PORT:-4180}} - # Should be the next release image -# image: ghcr.io/etalab-ia/opengatellm/playground:0.4.2 - environment: - - "OPENGATELLM_URL=${OPENGATELLM_URL:-http://api:8000}" - - "PLAYGROUND_ADMIN_API_KEY=${PLAYGROUND_ADMIN_API_KEY}" - - "REDIS_HOST=redis" - - "REDIS_PORT=${REDIS_PORT:-6379}" - ports: - - "${PLAYGROUND_PORT:-8501}:8501" - volumes: - - "./${CONFIG_FILE:-config.yml}:/config.yml:ro" - healthcheck: - test: [ "CMD-SHELL", "curl -sf http://localhost:8501/ping || exit 1" ] - interval: 5s - timeout: 5s - retries: 10 - start_period: 30s - depends_on: - redis: - condition: service_healthy - postgres: - condition: service_healthy - - # OAuth2-proxy : point d'entrée pour l'authentification ProConnect (OIDC) - # Proxifie vers le playground après authentification. - # Accès : http://localhost:${OAUTH2_PROXY_PORT:-4180} - # Pour l'activer : docker compose --profile proconnect up - oauth2-proxy: - image: quay.io/oauth2-proxy/oauth2-proxy:v7.8.1 - profiles: ["proconnect"] - command: --config /oauth2-proxy.cfg - ports: - - "${OAUTH2_PROXY_PORT:-4180}:4180" - volumes: - - "./oauth2-proxy.cfg:/oauth2-proxy.cfg:ro" - environment: - - "OAUTH2_PROXY_CLIENT_ID=${PROCONNECT_CLIENT_ID}" - - "OAUTH2_PROXY_CLIENT_SECRET=${PROCONNECT_CLIENT_SECRET}" - - "OAUTH2_PROXY_COOKIE_SECRET=${OAUTH2_PROXY_COOKIE_SECRET}" - depends_on: - playground: - condition: service_healthy - - postgres: - image: postgres:16.5 - restart: always - user: postgres - environment: - - "POSTGRES_USER=${POSTGRES_USER:-postgres}" - - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-changeme}" - - "POSTGRES_DB=postgres" - ports: - - "${POSTGRES_PORT:-5432}:5432" - volumes: - - postgres:/var/lib/postgresql/data - healthcheck: - test: [ "CMD-SHELL", "pg_isready", "-U", "postgres" ] - interval: 4s - timeout: 10s - retries: 5 - start_period: 60s - - redis: - image: redis/redis-stack-server:7.4.0-v7 - restart: always - environment: - REDIS_ARGS: "--dir /data --requirepass ${REDIS_PASSWORD:-changeme} --user ${REDIS_USER:-redis} on >password ~* allcommands --save 60 1 --appendonly yes" - ports: - - "${REDIS_PORT:-6379}:6379" - volumes: - - redis:/data - healthcheck: - test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ] - interval: 4s - timeout: 10s - retries: 5 - start_period: 60s - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:9.0.2 - restart: always - ports: - - "${ELASTICSEARCH_PORT:-9200}:9200" - environment: - - discovery.type=single-node - - xpack.security.enabled=false - - "ES_JAVA_OPTS=-Xms1g -Xmx1g" - - "ELASTIC_USERNAME=elasticsearch" - - "ELASTIC_PASSWORD=changeme" - volumes: - - elasticsearch:/usr/share/elasticsearch/data - healthcheck: - test: [ "CMD-SHELL", "bash", "-c", ":> /dev/tcp/127.0.0.1/9200" ] - interval: 4s - timeout: 10s - retries: 5 - start_period: 60s - -volumes: - elasticsearch: - postgres: - redis: diff --git a/config.example.yml b/config.example.yml index 01d059007..88e799b02 100644 --- a/config.example.yml +++ b/config.example.yml @@ -84,8 +84,9 @@ settings: # search_multi_agents_reranker_model: my-model playground_opengatellm_url: ${OPENGATELLM_URL} - playground_admin_api_key: ${PLAYGROUND_ADMIN_API_KEY} - playground_default_role_id: 2 + # playground_sso_enabled: False + # playground_sso_opengatellm_admin_api_key: ${SSO_OPENGATELLM_ADMIN_API_KEY} + # playground_sso_opengatellm_default_role_id: 1 # playground_default_model: my-model # playground_theme_has_background: True # playground_theme_accent_color: purple diff --git a/playground/app/app.py b/playground/app/app.py index 5e0db39b6..ba3be48d6 100644 --- a/playground/app/app.py +++ b/playground/app/app.py @@ -122,7 +122,6 @@ def providers() -> rx.Component: # Create the app with theme configuration app = rx.App( - stylesheets=["proconnect.css"], theme=rx.theme( has_background=configuration.settings.playground_theme_has_background, accent_color=configuration.settings.playground_theme_accent_color, @@ -135,8 +134,11 @@ def providers() -> rx.Component: head_components=[rx.el.link(rel="icon", type="image/svg+xml", href="/favicon.svg")], ) + # Add pages -app.add_page(component=index, route="/", on_load=[AuthState.login_proconnect]) +sso_login = [AuthState.sso_login] if configuration.settings.playground_sso_enabled else [] + +app.add_page(component=index, route="/", on_load=sso_login) app.add_page(component=account, route="/account") app.add_page(component=keys, route="/keys", on_load=[KeysState.load_entities]) app.add_page(component=usage, route="/usage", on_load=[UsageState.load_entities]) diff --git a/playground/app/core/configuration.py b/playground/app/core/configuration.py index 371467dbb..993acdfc8 100644 --- a/playground/app/core/configuration.py +++ b/playground/app/core/configuration.py @@ -2,7 +2,7 @@ import logging import os import re -from typing import Any +from typing import Any, get_args, get_origin from pydantic import BaseModel, ConfigDict, Field, constr, field_validator, model_validator from pydantic import ValidationError as PydanticValidationError @@ -12,7 +12,7 @@ from app.core.variables import DEFAULT_APP_NAME -def custom_validation_error(url: str | None = None): +def custom_validation_error(suffix: str = ""): """ Decorator to override Pydantic ValidationError to change error message. @@ -21,25 +21,50 @@ def custom_validation_error(url: str | None = None): """ class ValidationError(Exception): - def __init__(self, exc: PydanticValidationError, cls: BaseModel, url: str): + def __init__( + self, exc: PydanticValidationError, cls: BaseModel, base_url: str = "https://docs.opengatellm.org/configuration/configuration_file" + ): super().__init__() - error_count = exc.error_count() error_content = exc.errors() - message = f"{error_count} validation error for {cls.__name__}\n" + def resolve_model_for_error(model: type[BaseModel], loc: tuple[Any, ...]): + current_model = model + documentation_url = base_url + + for idx, part in enumerate(loc): + if not isinstance(part, str): + continue + if part not in current_model.__pydantic_fields__: + break + + field_info = current_model.__pydantic_fields__[part] + + annotation = field_info.annotation + next_model = None + origin = get_origin(annotation) + args = get_args(annotation) + candidates = args if origin is not None else (annotation,) + + for candidate in candidates: + if isinstance(candidate, type) and issubclass(candidate, BaseModel): + next_model = candidate + break + + if next_model is None: + break + + current_model = next_model + documentation_url = f"{base_url}#{current_model.__name__.lower()}{suffix}" + + return documentation_url + + message = str(exc) for error in error_content: - url = url or error["url"] - if error["type"] == "assertion_error": - message += f"{error['msg']}\n" - else: - if len(error["loc"]) > 0: - message += f"{error['loc'][0]}\n" - message += f" {error["msg"]} [type={error["type"]}, input_value={error.get("input", "")}, input_type={type(error.get("input")).__name__}]\n" # fmt: off - if len(error["loc"]) > 0: - description = cls.__pydantic_fields__[error["loc"][0]].description - if description: - message += f"\n {description}\n" - message += f" For further information visit {url}\n\n" + loc = tuple(error.get("loc", ())) + documentation_url = resolve_model_for_error(cls, loc) + original_line = f" For further information visit {error['url']}" + replacement_line = f" For further information visit {documentation_url}" + message = message.replace(original_line, replacement_line, 1) self.message = message @@ -54,7 +79,7 @@ def new_init(self, **data): try: original_init(self, **data) except PydanticValidationError as e: - raise ValidationError(exc=e, cls=cls, url=url) from None # hide previous traceback + raise ValidationError(exc=e, cls=cls) from None # hide previous traceback cls.__init__ = new_init return cls @@ -66,26 +91,29 @@ class ConfigBaseModel(BaseModel): model_config = ConfigDict(extra="allow") -@custom_validation_error(url="https://docs.opengatellm.org/configuration/configuration_file#redisdependency-1") +@custom_validation_error(suffix="-1") class RedisDependency(ConfigBaseModel): url: constr(strip_whitespace=True, min_length=1) = Field(..., pattern=r"^redis://", description="Redis connection url.", examples=["redis://:changeme@localhost:6379"]) # fmt: off -@custom_validation_error(url="https://docs.opengatellm.org/configuration/configuration_file#dependencies-1") +@custom_validation_error(suffix="-1") class Dependencies(ConfigBaseModel): redis: RedisDependency | None = Field(default=None, description="Set the Redis connection url to use as stage manager. See https://reflex.dev/docs/api-reference/config/ for more information.") # fmt: off -@custom_validation_error(url="https://docs.opengatellm.org/configuration/configuration_file#settings-1") +@custom_validation_error(suffix="-1") class Settings(ConfigBaseModel): auth_key_max_expiration_days: int | None = Field(default=None, ge=1, description="Maximum number of days for a token to be valid.") # fmt: off routing_max_priority: int = Field(default=10, ge=0, description="Maximum allowed priority in routing tasks.") # fmt: off app_title: str = Field(default=DEFAULT_APP_NAME, description="The title of the application.") playground_opengatellm_url: str = Field(default="http://localhost:8000", description="The URL of the OpenGateLLM API.") - playground_admin_api_key: str = Field(description="The API key to use to access the admin API.") - playground_default_role_id: str | int = Field(description="The default role ID for new users.") playground_opengatellm_timeout: int = Field(default=60, description="The timeout in seconds for the OpenGateLLM API.") + + playground_sso_enabled: bool = Field(default=False, description="Whether SSO is enabled.") + playground_sso_opengatellm_admin_api_key: str | None = Field(default=None, description="To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens.") # fmt: off + playground_sso_opengatellm_default_role_id: int | None = Field(default=None, description="To activate SSO, set the default role ID of OpenGateLLM API for new users.") # fmt: off + playground_default_model: str | None = Field(default=None, description="The first model selected in chat page.") playground_theme_has_background: bool = Field(default=True, description="Whether the theme has a background.") playground_theme_accent_color: str = Field(default="purple", description="The primary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors.") # fmt: off @@ -99,6 +127,15 @@ class Settings(ConfigBaseModel): reference_url: str | None = Field(default="http://localhost:8000/redoc", pattern=r"^http[s]?://", description="Reference URL. If not provided, deactivated reference link in the navigation bar.") # fmt: off documentation_url: str | None = Field(default="https://docs.opengatellm.org", pattern=r"^http[s]?://", description="Documentation URL. If not provided, deactivated documentation link in the navigation bar.") # fmt: off + @model_validator(mode="after") + def validate_sso_enabled(self): + if self.playground_sso_enabled: + if self.playground_sso_opengatellm_admin_api_key is None: + raise ValueError("SSO is enabled but no OpenGateLLM API key with ADMIN permissions is provided.") + if self.playground_sso_opengatellm_default_role_id is None: + raise ValueError("SSO is enabled but no default role ID is provided.") + return self + class ConfigFile(ConfigBaseModel): """ @@ -132,6 +169,14 @@ def setup_config(cls, values) -> Any: file_content = cls.replace_environment_variables(file_content="".join(uncommented_lines)) config = ConfigFile(**yaml.safe_load(stream=file_content)) + try: + default_role_id = config.settings.playground_sso_opengatellm_default_role_id + if default_role_id is not None: + default_role_id = int(default_role_id) + config.settings.playground_sso_opengatellm_default_role_id = default_role_id + except ValueError: + raise ValueError("For SSO to be enabled, default role ID must be an integer.") + values.dependencies = config.dependencies values.settings = config.settings diff --git a/playground/app/features/account/state.py b/playground/app/features/account/state.py index f218eb97c..0abad9179 100644 --- a/playground/app/features/account/state.py +++ b/playground/app/features/account/state.py @@ -3,7 +3,6 @@ import httpx import reflex as rx -from app.core.configuration import configuration from app.features.auth.state import AuthState from app.shared.components.toasts import httpx_error_toast @@ -67,7 +66,7 @@ async def change_password(self): url=f"{self.opengatellm_url}/v1/me/info", headers={"Authorization": f"Bearer {self.api_key}", "Content-Type": "application/json"}, json={"current_password": self.current_password, "password": self.new_password}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -104,7 +103,7 @@ async def update_name(self): url=f"{self.opengatellm_url}/v1/me/info", headers={"Authorization": f"Bearer {self.api_key}", "Content-Type": "application/json"}, json={"name": self.edit_name.strip()}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() diff --git a/playground/app/features/auth/components/forms.py b/playground/app/features/auth/components/forms.py index 9d70bc41a..cf9a5d577 100644 --- a/playground/app/features/auth/components/forms.py +++ b/playground/app/features/auth/components/forms.py @@ -57,7 +57,7 @@ def login_form() -> rx.Component: ), rx.button( "Sign In", - on_click=AuthState.login_direct, + on_click=AuthState.basic_login, width="100%", loading=AuthState.is_loading, disabled=AuthState.is_loading, @@ -66,40 +66,6 @@ def login_form() -> rx.Component: spacing="4", width="100%", ), - rx.vstack( - rx.hstack( - rx.separator(flex_grow="1"), - rx.text("ou", size="1", color=rx.color("gray", 9)), - rx.separator(flex_grow="1"), - width="100%", - align="center", - spacing="2", - ), - rx.center( - rx.el.button( - rx.el.span( - "S'identifier avec ProConnect", - class_name="proconnect-sr-only", - ), - class_name="proconnect-button", - type="button", - on_click=AuthState.login_proconnect, - ), - width="100%", - ), - rx.center( - rx.el.a( - "Qu'est-ce que ProConnect ?", - href="https://www.proconnect.gouv.fr/", - target="_blank", - rel="noopener noreferrer", - ), - width="100%", - ), - spacing="3", - width="100%", - padding_top="1em", - ), spacing="0", width="100%", ), diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index 41e55d681..43458a13a 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -30,8 +30,9 @@ class AuthState(rx.State): is_loading: bool = False opengatellm_url: str = configuration.settings.playground_opengatellm_url - admin_api_key: str = configuration.settings.playground_admin_api_key - default_role_id: int = int(configuration.settings.playground_default_role_id) + opengatellm_timeout: int = configuration.settings.playground_opengatellm_timeout + sso_opengatellm_admin_api_key: str | None = configuration.settings.playground_sso_opengatellm_admin_api_key + sso_opengatellm_default_role_id: int | None = configuration.settings.playground_sso_opengatellm_default_role_id # Form fields email_input: str = "" @@ -47,23 +48,47 @@ def set_password_input(self, value: str): """Set password input value.""" self.password_input = value + async def _login(self, client: httpx.AsyncClient, email: str, password: str): + response = await client.post( + url=f"{self.opengatellm_url}/v1/auth/login", + json={"email": email, "password": password}, + timeout=self.opengatellm_timeout, + ) + return response + + async def _create_api_key(self, client: httpx.AsyncClient, email: str): + response = await client.post( + url=f"{self.opengatellm_url}/v1/admin/tokens", + json={"email": email, "name": "playground"}, + headers={"Authorization": f"Bearer {self.sso_opengatellm_admin_api_key}"}, + timeout=self.opengatellm_timeout, + ) + return response + + async def _create_user(self, client: httpx.AsyncClient, email: str): + response = await client.post( + url=f"{self.opengatellm_url}/v1/admin/users", + json={"email": email, "name": email, "role": self.sso_opengatellm_default_role_id}, + headers={"Authorization": f"Bearer {self.sso_opengatellm_admin_api_key}"}, + timeout=self.opengatellm_timeout, + ) + return response + + async def _get_user_info(self, client: httpx.AsyncClient, api_key: str): + response = await client.get( + url=f"{self.opengatellm_url}/v1/me/info", + headers={"Authorization": f"Bearer {api_key}"}, + timeout=self.opengatellm_timeout, + ) + return response + @rx.event - async def login_proconnect(self): - """Auto-login using the ProConnect identity injected by oauth2-proxy. - - Reads the X-Auth-Request-Email header forwarded by oauth2-proxy into the WebSocket - connection. If the header is present, calls POST /v1/auth/proconnect on the API - (no password required - the OIDC authentication already happened at the proxy level). - If the header is absent the user landed directly on the playground (port 8501) and - no action is taken - they can still log in with email/password. - """ - if self.is_authenticated: - return + async def basic_login(self): + email = self.email_input.strip() + password = self.password_input.strip() - # oauth2-proxy injecte X-Forwarded-Email (via pass_user_headers=true) - # accessible via raw_headers (clés en minuscules avec tirets) - email = self.router.headers.raw_headers.get("x-forwarded-email") - if not email: + if not email or not password: + yield rx.toast.warning("Email and password are required", position="bottom-right") return self.is_loading = True @@ -72,75 +97,19 @@ async def login_proconnect(self): response = None try: async with httpx.AsyncClient() as client: - # response = await client.post( - # f"{self.opengatellm_url}/v1/auth/proconnect", - # headers={"X-Auth-Request-Email": email}, - # timeout=configuration.settings.playground_opengatellm_timeout, - # ) - import requests - - url = f"{self.opengatellm_url}/v1/admin/users" - response = requests.get(url=url, params={"email": email}, headers={"Authorization": f"Bearer {self.admin_api_key}"}) - if response.status_code == 404: - # TODO: rendre le password optionnel - response = requests.post( - url=url, - json={"email": email, "name": email, "password": "changeme", "role": self.default_role_id}, - headers={"Authorization": f"Bearer {self.admin_api_key}"}, - ) - if response.status_code != 201: - error_detail = response.json().get("detail", "Failed to create user") - error_detail = f"Failed to create user: {error_detail}\nURL: {url}\nAPI Key: {self.admin_api_key}" - yield rx.toast.error(error_detail, position="bottom-right") - self.is_loading = False - yield - return - - user_id = response.json().get("id") - - elif response.status_code == 200: - user_id = response.json().get("data", [])[0]["id"] - else: - error_detail = response.json().get("detail", "Failed to fetch user info") - error_detail = f"Failed to fetch user info: {error_detail}\nURL: {url}\nAPI Key: {self.admin_api_key}" - - yield rx.toast.error(error_detail, position="bottom-right") - self.is_loading = False - yield - return - - # TODO: support email as param to /v1/admin/tokens endpoint - # TODO: add SSO expiration duration - response = requests.post( - url=f"{self.opengatellm_url}/v1/admin/tokens", - json={"user": user_id, "name": "playground"}, - headers={"Authorization": f"Bearer {self.admin_api_key}"}, - ) - if response.status_code != 201: - error_detail = response.json().get("detail", "Failed to create token") - error_detail = f"Failed to create token: {error_detail}\nURL: {url}\nAPI Key: {self.admin_api_key}" - yield rx.toast.error(error_detail, position="bottom-right") - self.is_loading = False - yield - return - - api_key = response.json().get("token") + # Create API key + response = await self._login(client=client, email=email, password=password) + response.raise_for_status() + api_key = response.json().get("key") api_key_id = response.json().get("id") - response = await client.get( - f"{self.opengatellm_url}/v1/me/info", - headers={"Authorization": f"Bearer {api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, - ) - - if response.status_code != 200: - yield rx.toast.error("Failed to fetch user info", position="bottom-right") - self.is_loading = False - yield - return + # Get user info + response = await self._get_user_info(client=client, api_key=api_key) + response.raise_for_status() user_data = response.json() + # Update state self.is_authenticated = True self.user_id = user_data.get("id") self.user_email = user_data.get("email") @@ -155,6 +124,14 @@ async def login_proconnect(self): self.user_permissions = user_data.get("permissions", []) self.user_limits = user_data.get("limits", []) + yield rx.toast.success("Successfully logged in!", position="bottom-right") + yield + + # Load models after successful login (if ChatState) + if hasattr(self, "load_models"): + async for _ in self.load_models(): + yield + except Exception as e: yield httpx_error_toast(exception=e, response=response) finally: @@ -162,13 +139,12 @@ async def login_proconnect(self): yield @rx.event - async def login_direct(self): - """Handle login using direct state values.""" - email = self.email_input.strip() - password = self.password_input.strip() + async def sso_login(self): + if self.is_authenticated: + return - if not email or not password: - yield rx.toast.warning("Email and password are required", position="bottom-right") + email = self.router.headers.raw_headers.get("x-forwarded-email") + if not email: return self.is_loading = True @@ -177,36 +153,23 @@ async def login_direct(self): response = None try: async with httpx.AsyncClient() as client: - # Login to get API key - response = await client.post( - f"{self.opengatellm_url}/v1/auth/login", - json={"email": email, "password": password}, - timeout=configuration.settings.playground_opengatellm_timeout, - ) - if response.status_code != 200: - error_detail = response.json().get("detail", "Login failed") - yield rx.toast.error(error_detail, position="bottom-right") - self.is_loading = False - yield - return - - login_data = response.json() - api_key = login_data.get("key") - api_key_id = login_data.get("id") + # Create API key + response = await self._create_api_key(client=client, email=email) - # Get user info - response = await client.get( - f"{self.opengatellm_url}/v1/me/info", - headers={"Authorization": f"Bearer {api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, - ) - - if response.status_code != 200: - yield rx.toast.error("Failed to fetch user info", position="bottom-right") - self.is_loading = False - yield - return + if response.status_code == 404: + response = await self._create_user(client=client, email=email) + response.raise_for_status() + + response = await self._create_api_key(client=client, email=email) + response.raise_for_status() + response.raise_for_status() + api_key = response.json().get("token") + api_key_id = response.json().get("id") + + # Get user info + response = await self._get_user_info(client=client, api_key=api_key) + response.raise_for_status() user_data = response.json() # Update state @@ -224,14 +187,6 @@ async def login_direct(self): self.user_permissions = user_data.get("permissions", []) self.user_limits = user_data.get("limits", []) - yield rx.toast.success("Successfully logged in!", position="bottom-right") - yield - - # Load models after successful login (if ChatState) - if hasattr(self, "load_models"): - async for _ in self.load_models(): - yield - except Exception as e: yield httpx_error_toast(exception=e, response=response) finally: diff --git a/playground/app/features/chat/state.py b/playground/app/features/chat/state.py index 121b2d804..53d4e82e2 100644 --- a/playground/app/features/chat/state.py +++ b/playground/app/features/chat/state.py @@ -61,7 +61,7 @@ async def load_models(self): response = await client.get( f"{self.opengatellm_url}/v1/models", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() data = response.json() @@ -204,7 +204,7 @@ async def api_process_question(self, question: str): "Content-Type": "application/json", }, json=payload, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) as response: if response.status_code != 200: error_text = await response.aread() @@ -242,7 +242,7 @@ async def api_process_question(self, question: str): "Content-Type": "application/json", }, json=payload, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) if response.status_code != 200: diff --git a/playground/app/features/keys/state.py b/playground/app/features/keys/state.py index 7c7128512..cc8df19ca 100644 --- a/playground/app/features/keys/state.py +++ b/playground/app/features/keys/state.py @@ -56,7 +56,7 @@ async def load_entities(self): url=f"{self.opengatellm_url}/v1/me/keys", params=params, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -106,7 +106,7 @@ async def delete_entity(self): response = await client.delete( url=f"{self.opengatellm_url}/v1/me/keys/{self.entity_to_delete.id}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -184,7 +184,7 @@ async def create_entity(self): url=f"{self.opengatellm_url}/v1/me/keys", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() data = response.json() diff --git a/playground/app/features/organizations/state.py b/playground/app/features/organizations/state.py index 897d0d7b0..16e02bc90 100644 --- a/playground/app/features/organizations/state.py +++ b/playground/app/features/organizations/state.py @@ -3,7 +3,6 @@ import httpx import reflex as rx -from app.core.configuration import configuration from app.features.organizations.models import Organization from app.shared.components.toasts import httpx_error_toast from app.shared.states.entity_state import EntityState @@ -56,7 +55,7 @@ async def load_entities(self): url=f"{self.opengatellm_url}/v1/admin/organizations", params=params, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -105,7 +104,7 @@ async def delete_entity(self): response = await client.delete( url=f"{self.opengatellm_url}/v1/admin/organizations/{self.entity_to_delete.id}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -152,7 +151,7 @@ async def create_entity(self): url=f"{self.opengatellm_url}/v1/admin/organizations", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -210,7 +209,7 @@ async def edit_entity(self): url=f"{self.opengatellm_url}/v1/admin/organizations/{self.entity.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() diff --git a/playground/app/features/providers/state.py b/playground/app/features/providers/state.py index 89d63a6de..3097cb9ca 100644 --- a/playground/app/features/providers/state.py +++ b/playground/app/features/providers/state.py @@ -4,7 +4,6 @@ import pycountry import reflex as rx -from app.core.configuration import configuration from app.features.providers.models import Provider from app.shared.components.toasts import httpx_error_toast from app.shared.states.entity_state import EntityState @@ -118,7 +117,7 @@ async def load_entities(self): url=f"{self.opengatellm_url}/v1/admin/routers", params={"offset": offset, "limit": 100}, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -134,7 +133,7 @@ async def load_entities(self): f"{self.opengatellm_url}/v1/admin/providers", params=params, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -146,7 +145,7 @@ async def load_entities(self): response = await client.get( url=f"{self.opengatellm_url}/v1/admin/users/{provider['user_id']}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) if response.status_code == 404: self.provider_owners[provider["user_id"]] = "Master" @@ -160,7 +159,7 @@ async def load_entities(self): response = await client.get( url=f"{self.opengatellm_url}/v1/admin/routers/{provider['router_id']}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) if response.status_code == 200: @@ -213,7 +212,7 @@ async def delete_entity(self): response = await client.delete( url=f"{self.opengatellm_url}/v1/admin/providers/{self.entity_to_delete.id}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -285,7 +284,7 @@ async def create_entity(self): url=f"{self.opengatellm_url}/v1/admin/providers", headers={"Authorization": f"Bearer {self.api_key}"}, json=payload, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -351,7 +350,7 @@ async def edit_entity(self): url=f"{self.opengatellm_url}/v1/admin/providers/{self.entity.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() diff --git a/playground/app/features/roles/state.py b/playground/app/features/roles/state.py index 5ea2ed4cf..54709794a 100644 --- a/playground/app/features/roles/state.py +++ b/playground/app/features/roles/state.py @@ -4,7 +4,6 @@ import httpx import reflex as rx -from app.core.configuration import configuration from app.features.roles.models import Role from app.shared.components.toasts import httpx_error_toast from app.shared.states.entity_state import EntityState @@ -89,7 +88,7 @@ async def load_entities(self): f"{self.opengatellm_url}/v1/admin/routers", params={"offset": offset, "limit": limit}, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -110,7 +109,7 @@ async def load_entities(self): "order_direction": self.order_direction_value, }, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -160,7 +159,7 @@ async def delete_entity(self): response = await client.delete( url=f"{self.opengatellm_url}/v1/admin/roles/{self.entity_to_delete.id}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -189,14 +188,12 @@ async def delete_limit(self, role: Role, router: str): if limit["router"] == router: continue - limits.extend( - [ - {"router_id": self.routers_dict[limit["router"]], "type": "rpm", "value": limit["rpm"]}, - {"router_id": self.routers_dict[limit["router"]], "type": "rpd", "value": limit["rpd"]}, - {"router_id": self.routers_dict[limit["router"]], "type": "tpm", "value": limit["tpm"]}, - {"router_id": self.routers_dict[limit["router"]], "type": "tpd", "value": limit["tpd"]}, - ] - ) + limits.extend([ + {"router_id": self.routers_dict[limit["router"]], "type": "rpm", "value": limit["rpm"]}, + {"router_id": self.routers_dict[limit["router"]], "type": "rpd", "value": limit["rpd"]}, + {"router_id": self.routers_dict[limit["router"]], "type": "tpm", "value": limit["tpm"]}, + {"router_id": self.routers_dict[limit["router"]], "type": "tpd", "value": limit["tpd"]}, + ]) yield @@ -208,7 +205,7 @@ async def delete_limit(self, role: Role, router: str): url=f"{self.opengatellm_url}/v1/admin/roles/{role.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -286,7 +283,7 @@ async def create_entity(self): url=f"{self.opengatellm_url}/v1/admin/roles", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -326,7 +323,7 @@ async def create_limit(self, role: Role): f"{self.opengatellm_url}/v1/admin/roles/{role.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}", "Content-Type": "application/json"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -416,7 +413,7 @@ async def edit_entity(self): url=f"{self.opengatellm_url}/v1/admin/roles/{self.entity.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() diff --git a/playground/app/features/routers/state.py b/playground/app/features/routers/state.py index ee923c415..6ba648cba 100644 --- a/playground/app/features/routers/state.py +++ b/playground/app/features/routers/state.py @@ -3,7 +3,6 @@ import httpx import reflex as rx -from app.core.configuration import configuration from app.features.routers.models import Router from app.shared.components.toasts import httpx_error_toast from app.shared.states.entity_state import EntityState @@ -15,16 +14,14 @@ class RoutersState(EntityState): @rx.var def router_types_list(self) -> list[str]: """Get list of router types.""" - return sorted( - [ - "image-to-text", - "image-text-to-text", - "automatic-speech-recognition", - "text-embeddings-inference", - "text-generation", - "text-classification", - ] - ) + return sorted([ + "image-to-text", + "image-text-to-text", + "automatic-speech-recognition", + "text-embeddings-inference", + "text-generation", + "text-classification", + ]) @rx.var def router_load_balancing_strategies_list(self) -> list[str]: @@ -88,7 +85,7 @@ async def load_entities(self): f"{self.opengatellm_url}/v1/admin/routers", params=params, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -99,9 +96,9 @@ async def load_entities(self): if router["user_id"] not in self.router_owners: async with httpx.AsyncClient() as client: response = await client.get( - url=f"{self.opengatellm_url}/v1/admin/users/{router["user_id"]}", + url=f"{self.opengatellm_url}/v1/admin/users/{router['user_id']}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) if response.status_code == 404: self.router_owners[router["user_id"]] = "Master" @@ -152,7 +149,7 @@ async def delete_entity(self): response = await client.delete( url=f"{self.opengatellm_url}/v1/admin/routers/{self.entity_to_delete.id}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -217,7 +214,7 @@ async def create_entity(self): url=f"{self.opengatellm_url}/v1/admin/routers", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -285,7 +282,7 @@ async def edit_entity(self): url=f"{self.opengatellm_url}/v1/admin/routers/{self.entity.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() diff --git a/playground/app/features/usage/state.py b/playground/app/features/usage/state.py index 40e579e82..766ffefcb 100644 --- a/playground/app/features/usage/state.py +++ b/playground/app/features/usage/state.py @@ -6,7 +6,6 @@ import httpx import reflex as rx -from app.core.configuration import configuration from app.features.usage.models import Usage from app.shared.components.toasts import httpx_error_toast from app.shared.states.entity_state import EntityState @@ -64,7 +63,7 @@ async def load_entities(self): url=f"{self.opengatellm_url}/v1/me/usage", params=params, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() data = response.json() @@ -82,17 +81,15 @@ async def load_entities(self): def usage_rows(self) -> list[dict[str, Any]]: rows: list[dict[str, Any]] = [] for row in self.entities: - rows.append( - { - "date": row.created, - "endpoint": row.endpoint, - "key": row.key, - "model": row.model, - "tokens": "" if row.total_tokens == 0 else f"{row.prompt_tokens} → {row.completion_tokens}", - "cost": "" if row.cost == 0.0 or row.cost is None else f"{row.cost:.4f}", - "kgCO2eq": "" if row.kgco2eq is None else f"{round(row.kgco2eq, 5)}", - } - ) + rows.append({ + "date": row.created, + "endpoint": row.endpoint, + "key": row.key, + "model": row.model, + "tokens": "" if row.total_tokens == 0 else f"{row.prompt_tokens} → {row.completion_tokens}", + "cost": "" if row.cost == 0.0 or row.cost is None else f"{row.cost:.4f}", + "kgCO2eq": "" if row.kgco2eq is None else f"{round(row.kgco2eq, 5)}", + }) return rows ############################################################ diff --git a/playground/app/features/users/state.py b/playground/app/features/users/state.py index 409c8c28a..f6db0561b 100644 --- a/playground/app/features/users/state.py +++ b/playground/app/features/users/state.py @@ -3,7 +3,6 @@ import httpx import reflex as rx -from app.core.configuration import configuration from app.features.users.models import User from app.shared.components.toasts import httpx_error_toast from app.shared.states.entity_state import EntityState @@ -99,7 +98,7 @@ async def load_entities(self): response = await client.get( url=f"{self.opengatellm_url}/v1/admin/roles", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -121,7 +120,7 @@ async def load_entities(self): url=f"{self.opengatellm_url}/v1/admin/organizations", params={"offset": offset, "limit": 100}, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -138,7 +137,7 @@ async def load_entities(self): url=f"{self.opengatellm_url}/v1/admin/users", params=params, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -187,7 +186,7 @@ async def delete_entity(self): response = await client.delete( url=f"{self.opengatellm_url}/v1/admin/users/{self.entity_to_delete.id}", headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -272,7 +271,7 @@ async def create_entity(self): url=f"{self.opengatellm_url}/v1/admin/users", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() @@ -347,7 +346,7 @@ async def edit_entity(self): url=f"{self.opengatellm_url}/v1/admin/users/{self.entity.id}", json=payload, headers={"Authorization": f"Bearer {self.api_key}"}, - timeout=configuration.settings.playground_opengatellm_timeout, + timeout=self.opengatellm_timeout, ) response.raise_for_status() diff --git a/playground/assets/proconnect.css b/playground/assets/proconnect.css deleted file mode 100644 index ed73828e3..000000000 --- a/playground/assets/proconnect.css +++ /dev/null @@ -1,26 +0,0 @@ -.proconnect-sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - white-space: nowrap; - border-width: 0; -} - -.proconnect-button { - background-color: transparent !important; - background-image: url("data:image/svg+xml;base64,<svg xmlns='http://www.w3.org/2000/svg' width='211' height='58' fill='none'><path fill='#000091' d='M0 0h211v58H0z'/><path fill='#fff' d='m69.986 26.368 1.156-1.071c.833 1.054 1.819 1.598 2.941 1.598 1.292 0 2.04-.816 2.04-1.904 0-2.55-5.627-2.244-5.627-6.035 0-1.734 1.428-3.196 3.451-3.196 1.683 0 2.907.765 3.791 1.938l-1.19 1.037c-.697-1.003-1.547-1.547-2.584-1.547-1.105 0-1.836.748-1.836 1.734 0 2.567 5.627 2.244 5.627 6.052 0 2.023-1.581 3.349-3.655 3.349-1.768 0-3.077-.663-4.114-1.955Zm10.817-5.712H79.46l1.445-4.556h1.649l-1.751 4.556Zm4.818-3.451c-.56 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM84.891 28v-8.568h1.444V28H84.89Zm3.767-4.284c0-2.499 1.717-4.624 4.403-4.624 1.241 0 2.261.459 3.043 1.292V15.25h1.445V28h-1.445v-.952c-.782.833-1.802 1.292-3.043 1.292-2.686 0-4.403-2.125-4.403-4.624Zm1.53 0c0 1.819 1.224 3.264 3.043 3.264 1.19 0 2.21-.578 2.873-1.598V22.05c-.68-1.037-1.7-1.598-2.873-1.598-1.819 0-3.043 1.445-3.043 3.264Zm18.023 2.873c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM110.473 28v-8.568h1.445v.969c.697-.765 1.581-1.309 2.856-1.309 1.921 0 3.349 1.292 3.349 3.723V28h-1.462v-5.134c0-1.53-.85-2.414-2.176-2.414-1.241 0-2.023.714-2.567 1.615V28h-1.445Zm11.052-2.873v-4.369h-1.615v-1.326h1.615V17.29h1.462v2.142h2.975v1.326h-2.975v4.369c0 1.343.68 1.717 1.717 1.717.561 0 .952-.068 1.275-.204v1.292c-.408.17-.867.238-1.479.238-1.904 0-2.975-.952-2.975-3.043Zm7.377-7.922c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM128.171 28v-8.568h1.445V28h-1.445Zm3.377-8.568h1.615v-1.054c0-1.836 1.207-3.128 3.043-3.128.952 0 1.7.34 2.21.833l-.901 1.054a1.633 1.633 0 0 0-1.292-.578c-.935 0-1.598.68-1.598 1.785v1.088h2.975v1.326h-2.975V28h-1.462v-7.242h-1.615v-1.326Zm8.543-2.227c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM139.36 28v-8.568h1.445V28h-1.445Zm12.115-1.411c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM153.737 28v-8.568h1.445v1.071c.629-.748 1.411-1.241 2.499-1.241.272 0 .527.034.731.102v1.496a3.105 3.105 0 0 0-.85-.119c-1.122 0-1.853.578-2.38 1.445V28h-1.445Zm13.685.34c-1.683 0-2.822-.952-2.822-2.448 0-1.326.986-2.278 2.822-2.567l2.873-.476v-.595c0-1.19-.85-1.87-2.057-1.87-1.003 0-1.836.442-2.329 1.19l-1.088-.833c.748-1.02 1.955-1.649 3.451-1.649 2.176 0 3.468 1.275 3.468 3.162V28h-1.445v-1.088c-.646.901-1.717 1.428-2.873 1.428Zm-1.377-2.499c0 .731.629 1.292 1.615 1.292 1.139 0 2.04-.595 2.635-1.581V23.92l-2.533.442c-1.19.187-1.717.731-1.717 1.479Zm7.252-6.409h1.564l2.737 7.055 2.737-7.055h1.564L178.55 28h-1.904l-3.349-8.568Zm17.856 7.157c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261Zm10.185 6.647c1.054 0 1.904-.51 2.431-1.275l1.156.884c-.799 1.071-2.04 1.751-3.604 1.751-2.839 0-4.658-2.125-4.658-4.624 0-2.499 1.819-4.624 4.658-4.624 1.547 0 2.805.697 3.604 1.751l-1.156.884a2.925 2.925 0 0 0-2.448-1.275c-1.836 0-3.145 1.445-3.145 3.264 0 1.836 1.309 3.264 3.162 3.264ZM70.854 45V32.4h4.158c2.772 0 4.464 1.422 4.464 3.762 0 2.322-1.692 3.744-4.464 3.744H73.41V45h-2.556Zm4.266-10.422h-1.71v3.15h1.71c1.08 0 1.728-.576 1.728-1.602 0-.954-.648-1.548-1.728-1.548ZM81.249 45v-9.072h2.286v.9c.594-.612 1.368-1.08 2.394-1.08.306 0 .576.054.792.126v2.394a3.938 3.938 0 0 0-1.008-.126c-1.116 0-1.836.612-2.178 1.17V45h-2.286Zm11.386-9.432c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm13.172-.234c1.44 0 2.574-.702 3.294-1.728l2.016 1.548c-1.152 1.566-3.024 2.574-5.31 2.574-3.978 0-6.696-3.06-6.696-6.66s2.718-6.66 6.696-6.66c2.286 0 4.158 1.026 5.31 2.556l-2.016 1.566c-.72-1.026-1.854-1.728-3.294-1.728-2.376 0-4.068 1.854-4.068 4.266s1.692 4.266 4.068 4.266Zm11.366-7.398c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm7.018 1.8v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm11.091 0v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm19.444-1.476c-.846 1.134-2.25 1.836-3.96 1.836-3.222 0-5.04-2.25-5.04-4.896 0-2.682 1.692-4.896 4.662-4.896 2.52 0 4.176 1.692 4.176 4.068 0 .504-.072.99-.144 1.296h-6.354c.144 1.494 1.188 2.376 2.736 2.376.99 0 1.8-.432 2.286-1.08l1.638 1.296Zm-4.338-6.048c-1.116 0-1.872.54-2.178 1.728h4.086c-.036-.9-.702-1.728-1.908-1.728Zm10.696 5.724c.882 0 1.584-.432 2.016-1.062l1.818 1.386c-.846 1.116-2.178 1.836-3.834 1.836-3.132 0-5.004-2.25-5.004-4.896s1.872-4.896 5.004-4.896c1.656 0 2.988.72 3.834 1.836l-1.818 1.386c-.432-.63-1.116-1.062-2.052-1.062-1.494 0-2.592 1.152-2.592 2.736 0 1.602 1.098 2.736 2.628 2.736Zm6.204-1.512v-3.672h-1.692v-2.088h1.692V33.66h2.304v2.268h2.772v2.088h-2.772v3.672c0 1.008.54 1.404 1.44 1.404.63 0 1.044-.072 1.35-.198v1.998c-.45.198-.99.288-1.746.288-2.268 0-3.348-1.278-3.348-3.492Z'/><path fill='#000091' d='M46.992 19.098 31.998 10.42l-14.994 8.76a.606.606 0 0 0-.306.525v16.948a.666.666 0 0 0 .306.524l14.992 8.6 14.994-8.706a.666.666 0 0 0 .306-.524V19.626a.604.604 0 0 0-.304-.528Z'/><path fill='#FCC63A' d='m26.641 19.598-5.029 8.628-4.557-9.175 5.39-3.113 4.489 3.16-.293.5Zm20.656 16.98V19.62a.6.6 0 0 0-.306-.523L31.998 10.42'/><path fill='#0063CB' d='M16.7 36.578 32 10.42v35.362l-14.996-8.605a.665.665 0 0 1-.306-.524V19.706l.002 16.872Zm24.669-20.735 5.458 3.155-4.489 9.15-5.387-9.236 4.418-3.07Z'/><path fill='#fff' d='m51.606 16.303-19.19-11.02a.933.933 0 0 0-.832 0l-19.19 11.02a.887.887 0 0 0-.394.695v22a.885.885 0 0 0 .394.7l19.189 11.02a.932.932 0 0 0 .832 0l19.191-11.02a.886.886 0 0 0 .394-.7v-22a.887.887 0 0 0-.394-.695ZM22.789 34.059h.079c-.042 0-.079.007-.079.05 0 .1.151 0 .2.1a.912.912 0 0 0-.629.276c0 .05.1.05.151.05-.075.1-.226.05-.277.152a.176.176 0 0 0 .1.05c-.05 0-.1 0-.1.05v.152c-.126 0-.176.1-.277.15.2.152.327 0 .528 0-.528.2-.956.479-1.484.63-.1 0 0 .15-.1.15.151.1.227-.05.377-.05-.654.378-1.333.7-2.037 1.133a.351.351 0 0 0-.1.2h-.2c-.1.05-.05.176-.151.277.226.15.5-.2.654 0 .05 0-.1.05-.2.05-.05 0-.05.1-.1.1h-.154c-.1.075-.2.126-.2.276a.22.22 0 0 0-.226.1 9.031 9.031 0 0 0 3.144-.578 7.683 7.683 0 0 0 2.088-1.56.176.176 0 0 1 .05.1c-.147.437-.43.816-.806 1.08-.277.152-.478.378-.7.479a4.057 4.057 0 0 0-.428.276c-.632.197-1.281.335-1.939.412l-.305.044c-.225.033-.449.069-.671.108l-1.993-1.138a.647.647 0 0 1-.288-.411.57.57 0 0 0 .094-.063.266.266 0 0 0-.113-.071v-.65a12.782 12.782 0 0 0 3.038-.942 8.746 8.746 0 0 0-3.037-1.343v-1.515a11.67 11.67 0 0 1 1.639.392 6.42 6.42 0 0 1 1.182.578c.147.14.307.267.478.377a.91.91 0 0 0 .8.05h.33a3.961 3.961 0 0 0 1.937-.905c0 .05.05.05.1.05a3.629 3.629 0 0 1-.428 1.132c.003.05-.048.152.053.202Zm2.817 3.57c.251-.1.4-.276.629-.376-.05.05-.05.15-.1.2a3.699 3.699 0 0 0-.528.4 15.965 15.965 0 0 0-1.585 1.61c-.252.3-.528.578-.8.855-.096.09-.2.172-.31.245l-2.527-1.45c.36.03.721.013 1.076-.053.294-.083.58-.192.855-.327v.1c.7-.277 1.232-.906 1.937-1.132.025 0 .126.1.226.05a1.883 1.883 0 0 1 1.509-.7c0 .05 0 .1.05.1h.025c-.151.126-.327.25-.5.377-.057.052-.007.102.043.102Zm-8.908-6.163v-.186a5.817 5.817 0 0 1 1.588-.188 1.52 1.52 0 0 1 .478 0 5.86 5.86 0 0 0-2.066.374Zm30.6 5.088a.665.665 0 0 1-.306.524l-10.079 5.85a32.296 32.296 0 0 1-3.408-1.184 2.826 2.826 0 0 1-.05-2.245c.08-.308.198-.605.352-.883.025-.025.05-.05.05-.076a.025.025 0 0 0 .025-.025 4.32 4.32 0 0 1 .377-.555l.015-.015.02-.021.015-.015c0-.025.025-.05.05-.076.025-.051.075-.076.1-.126.176-.186.37-.354.579-.5.213-.077.431-.136.654-.177.811.06 1.617.17 2.415.328a.752.752 0 0 1 .277.1c.301.059.612.041.905-.05a1.137 1.137 0 0 0 .855-.706 1.212 1.212 0 0 0 .05-1.06c-.178-.275-.013-.436.181-.59l.068-.054c.086-.061.164-.134.231-.216.126-.252-.1-.4-.151-.63-.05-.1-.226-.05-.327-.2.352-.151.855-.43.629-.857-.151-.227-.377-.63-.1-.857.352-.2.855-.151 1.006-.48a1.137 1.137 0 0 0-.292-1.084l-.075-.108a4.754 4.754 0 0 1-.211-.32 6.905 6.905 0 0 0-.528-.757 4.297 4.297 0 0 1-.528-1.01c-.151-.377.05-.705.05-1.083a6.347 6.347 0 0 0-.327-2.144c-.126-.353-.176-.731-.327-1.06a1.12 1.12 0 0 0-.226-.58.374.374 0 0 1 0-.327c.205-.145.399-.305.579-.48a.567.567 0 0 0-.2-.705c-.327-.151-.3.328-.528.429h-.151c-.05-.126.05-.177.151-.277 0-.05 0-.151-.05-.151-.2 0-.377-.051-.428-.151a3.957 3.957 0 0 0-1.861-1.286c.188.058.382.091.579.1.338.071.69.036 1.006-.1.227-.076.277-.48.377-.706a.8.8 0 0 0-.151-.631 2.19 2.19 0 0 0-.906-.756 9.13 9.13 0 0 1-.679-.353.956.956 0 0 0-.251-.126c-2.965-1.485-9.069-.2-9.534 0h-.009a8.254 8.254 0 0 0-1.249.475 3.922 3.922 0 0 0-2.365 2.465 3.83 3.83 0 0 0-1.333 1.509c-.428.8-1.056 1.509-.956 2.414.1.78.277 1.484.428 2.289.043.272.11.54.2.8.1.276 0 .629.151.855.075.15.025.327.227.428v.2c.05.05.05.1.151.1v.2c.435.423.807.906 1.107 1.434.1.276-.478.15-.7.05a5.977 5.977 0 0 1-1.132-.956.176.176 0 0 0-.051.1c.2.352.906.78.528 1.006-.2.1-.428-.151-.629.05-.05.076 0 .177 0 .277-.277-.2-.578-.1-.855-.2-.2-.05-.252-.427-.478-.427a15.191 15.191 0 0 0-1.811-.327 15.144 15.144 0 0 0-1.739-.16V19.707a.606.606 0 0 1 .306-.524l14.987-8.761 14.994 8.677a.605.605 0 0 1 .306.524v16.932Zm-7.954-8.261a.325.325 0 0 1-.282.149 2.84 2.84 0 0 0-.282.273c.1 0 0 .149.1.149-.205.223.077.694-.205.793-.37.099-.758.099-1.127 0a.727.727 0 0 1 .167-.016h.085a.382.382 0 0 0 .337-.132v-.2c0-.05-.051-.05-.1-.05a.16.16 0 0 1-.1.05.223.223 0 0 0-.154-.2.806.806 0 0 1-.718-.273.67.67 0 0 1 .436-.05c.128 0 .077-.223.231-.322h.154c.307-.372.871-.471.974-.843 0-.1-.282-.1-.487-.15a2.26 2.26 0 0 0-.82.05c-.36.05-.712.142-1.051.274.28-.206.592-.365.923-.471.232-.09.473-.157.718-.2l.132-.026.133-.027a.97.97 0 0 1 .556 0c.231.1.615.1.666.248.1.273-.154.545-.435.744-.057.08.149.135.149.23Z'/><rect width='29.56' height='13.302' x='37' y='5' fill='#FCC63A' rx='2'/><path fill='#161616' d='M39.562 16.168V7.316h2.921c.97 0 1.732.236 2.289.708.565.472.847 1.117.847 1.935 0 .81-.282 1.45-.847 1.922-.557.472-1.32.708-2.289.708h-1.125v3.579h-1.796Zm2.997-7.322h-1.201v2.213h1.2c.38 0 .675-.097.886-.29.22-.195.329-.473.329-.836 0-.337-.11-.602-.329-.796-.21-.194-.506-.291-.885-.291ZM47.23 16.168V7.316h2.707c.97 0 1.736.236 2.301.708.565.472.847 1.117.847 1.935 0 .53-.126.995-.379 1.39-.244.389-.59.688-1.037.899l2.782 3.92h-2.15l-2.352-3.579h-.923v3.579h-1.795Zm2.808-7.322h-1.012v2.213h1.012c.38 0 .674-.097.885-.29.21-.195.316-.473.316-.836 0-.337-.105-.602-.316-.796-.21-.194-.506-.291-.885-.291ZM59.549 7.063c.69 0 1.323.126 1.896.38.582.252 1.08.59 1.492 1.011.414.421.734.919.962 1.492.227.565.341 1.164.341 1.796 0 .632-.114 1.235-.341 1.808a4.485 4.485 0 0 1-.962 1.48c-.413.421-.91.758-1.492 1.011a4.648 4.648 0 0 1-1.896.38 4.738 4.738 0 0 1-3.402-1.391 4.484 4.484 0 0 1-.961-1.48 4.855 4.855 0 0 1-.342-1.808c0-.633.114-1.231.342-1.796.227-.573.548-1.07.961-1.492.413-.422.91-.759 1.492-1.012a4.737 4.737 0 0 1 1.91-.379Zm0 7.676a2.8 2.8 0 0 0 1.138-.228c.354-.16.653-.37.898-.632.252-.27.45-.586.594-.949a3.27 3.27 0 0 0 .215-1.188 3.17 3.17 0 0 0-.215-1.176 2.791 2.791 0 0 0-.595-.949 2.548 2.548 0 0 0-.897-.632 2.673 2.673 0 0 0-1.138-.24c-.413 0-.797.08-1.151.24a2.678 2.678 0 0 0-.91.632 2.899 2.899 0 0 0-.582.949 3.17 3.17 0 0 0-.215 1.176c0 .421.071.817.215 1.188.143.363.337.679.581.949.253.261.557.472.91.632.355.152.739.228 1.152.228Z'/></svg>"); - background-position: 50% 50%; - background-repeat: no-repeat; - width: 214px; - height: 56px; - border: none; - cursor: pointer !important; -} - -.proconnect-button:hover { - background-image: url("data:image/svg+xml;base64,<svg xmlns='http://www.w3.org/2000/svg' width='211' height='58' fill='none'><g clip-path='url(#a)'><path fill='#1212FF' d='M211 0H0v58h211V0Z'/><path fill='#fff' d='m69.986 26.368 1.156-1.071c.833 1.054 1.819 1.598 2.941 1.598 1.292 0 2.04-.816 2.04-1.904 0-2.55-5.627-2.244-5.627-6.035 0-1.734 1.428-3.196 3.451-3.196 1.683 0 2.907.765 3.791 1.938l-1.19 1.037c-.697-1.003-1.547-1.547-2.584-1.547-1.105 0-1.836.748-1.836 1.734 0 2.567 5.627 2.244 5.627 6.052 0 2.023-1.581 3.349-3.655 3.349-1.768 0-3.077-.663-4.114-1.955Zm10.817-5.712H79.46l1.445-4.556h1.649l-1.751 4.556Zm4.818-3.451c-.56 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM84.891 28v-8.568h1.444V28H84.89Zm3.767-4.284c0-2.499 1.717-4.624 4.403-4.624 1.241 0 2.261.459 3.043 1.292V15.25h1.445V28h-1.445v-.952c-.782.833-1.802 1.292-3.043 1.292-2.686 0-4.403-2.125-4.403-4.624Zm1.53 0c0 1.819 1.224 3.264 3.043 3.264 1.19 0 2.21-.578 2.873-1.598V22.05c-.68-1.037-1.7-1.598-2.873-1.598-1.819 0-3.043 1.445-3.043 3.264Zm18.023 2.873c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM110.473 28v-8.568h1.445v.969c.697-.765 1.581-1.309 2.856-1.309 1.921 0 3.349 1.292 3.349 3.723V28h-1.462v-5.134c0-1.53-.85-2.414-2.176-2.414-1.241 0-2.023.714-2.567 1.615V28h-1.445Zm11.052-2.873v-4.369h-1.615v-1.326h1.615V17.29h1.462v2.142h2.975v1.326h-2.975v4.369c0 1.343.68 1.717 1.717 1.717.561 0 .952-.068 1.275-.204v1.292c-.408.17-.867.238-1.479.238-1.904 0-2.975-.952-2.975-3.043Zm7.377-7.922c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM128.171 28v-8.568h1.445V28h-1.445Zm3.377-8.568h1.615v-1.054c0-1.836 1.207-3.128 3.043-3.128.952 0 1.7.34 2.21.833l-.901 1.054a1.633 1.633 0 0 0-1.292-.578c-.935 0-1.598.68-1.598 1.785v1.088h2.975v1.326h-2.975V28h-1.462v-7.242h-1.615v-1.326Zm8.543-2.227c-.561 0-1.02-.459-1.02-1.02a1.02 1.02 0 0 1 1.02-1.003c.561 0 1.003.459 1.003 1.003 0 .561-.442 1.02-1.003 1.02ZM139.36 28v-8.568h1.445V28h-1.445Zm12.115-1.411c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261ZM153.737 28v-8.568h1.445v1.071c.629-.748 1.411-1.241 2.499-1.241.272 0 .527.034.731.102v1.496a3.105 3.105 0 0 0-.85-.119c-1.122 0-1.853.578-2.38 1.445V28h-1.445Zm13.685.34c-1.683 0-2.822-.952-2.822-2.448 0-1.326.986-2.278 2.822-2.567l2.873-.476v-.595c0-1.19-.85-1.87-2.057-1.87-1.003 0-1.836.442-2.329 1.19l-1.088-.833c.748-1.02 1.955-1.649 3.451-1.649 2.176 0 3.468 1.275 3.468 3.162V28h-1.445v-1.088c-.646.901-1.717 1.428-2.873 1.428Zm-1.377-2.499c0 .731.629 1.292 1.615 1.292 1.139 0 2.04-.595 2.635-1.581V23.92l-2.533.442c-1.19.187-1.717.731-1.717 1.479Zm7.252-6.409h1.564l2.737 7.055 2.737-7.055h1.564L178.55 28h-1.904l-3.349-8.568Zm17.856 7.157c-.799 1.071-2.074 1.751-3.672 1.751-2.89 0-4.675-2.125-4.675-4.624 0-2.601 1.666-4.624 4.318-4.624 2.329 0 3.842 1.581 3.842 3.723 0 .34-.051.68-.102.918h-6.562v.034c0 1.887 1.292 3.264 3.213 3.264 1.088 0 2.006-.51 2.567-1.275l1.071.833Zm-4.012-6.256c-1.394 0-2.38.782-2.72 2.261h5.083c-.051-1.241-.952-2.261-2.363-2.261Zm10.185 6.647c1.054 0 1.904-.51 2.431-1.275l1.156.884c-.799 1.071-2.04 1.751-3.604 1.751-2.839 0-4.658-2.125-4.658-4.624 0-2.499 1.819-4.624 4.658-4.624 1.547 0 2.805.697 3.604 1.751l-1.156.884a2.925 2.925 0 0 0-2.448-1.275c-1.836 0-3.145 1.445-3.145 3.264 0 1.836 1.309 3.264 3.162 3.264ZM70.854 45V32.4h4.158c2.772 0 4.464 1.422 4.464 3.762 0 2.322-1.692 3.744-4.464 3.744H73.41V45h-2.556Zm4.266-10.422h-1.71v3.15h1.71c1.08 0 1.728-.576 1.728-1.602 0-.954-.648-1.548-1.728-1.548ZM81.249 45v-9.072h2.286v.9c.594-.612 1.368-1.08 2.394-1.08.306 0 .576.054.792.126v2.394a3.938 3.938 0 0 0-1.008-.126c-1.116 0-1.836.612-2.178 1.17V45h-2.286Zm11.386-9.432c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm13.172-.234c1.44 0 2.574-.702 3.294-1.728l2.016 1.548c-1.152 1.566-3.024 2.574-5.31 2.574-3.978 0-6.696-3.06-6.696-6.66s2.718-6.66 6.696-6.66c2.286 0 4.158 1.026 5.31 2.556l-2.016 1.566c-.72-1.026-1.854-1.728-3.294-1.728-2.376 0-4.068 1.854-4.068 4.266s1.692 4.266 4.068 4.266Zm11.366-7.398c2.952 0 4.968 2.178 4.968 4.896s-2.016 4.896-4.968 4.896-4.968-2.178-4.968-4.896 2.016-4.896 4.968-4.896Zm.036 7.632c1.458 0 2.556-1.17 2.556-2.736 0-1.584-1.098-2.736-2.556-2.736-1.512 0-2.628 1.152-2.628 2.736 0 1.584 1.116 2.736 2.628 2.736Zm7.018 1.8v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm11.091 0v-9.072h2.286v.72c.63-.612 1.476-1.08 2.682-1.08 1.962 0 3.528 1.35 3.528 4.032V45h-2.322v-5.31c0-1.206-.666-1.962-1.782-1.962-1.152 0-1.764.774-2.106 1.35V45h-2.286Zm19.444-1.476c-.846 1.134-2.25 1.836-3.96 1.836-3.222 0-5.04-2.25-5.04-4.896 0-2.682 1.692-4.896 4.662-4.896 2.52 0 4.176 1.692 4.176 4.068 0 .504-.072.99-.144 1.296h-6.354c.144 1.494 1.188 2.376 2.736 2.376.99 0 1.8-.432 2.286-1.08l1.638 1.296Zm-4.338-6.048c-1.116 0-1.872.54-2.178 1.728h4.086c-.036-.9-.702-1.728-1.908-1.728Zm10.696 5.724c.882 0 1.584-.432 2.016-1.062l1.818 1.386c-.846 1.116-2.178 1.836-3.834 1.836-3.132 0-5.004-2.25-5.004-4.896s1.872-4.896 5.004-4.896c1.656 0 2.988.72 3.834 1.836l-1.818 1.386c-.432-.63-1.116-1.062-2.052-1.062-1.494 0-2.592 1.152-2.592 2.736 0 1.602 1.098 2.736 2.628 2.736Zm6.204-1.512v-3.672h-1.692v-2.088h1.692V33.66h2.304v2.268h2.772v2.088h-2.772v3.672c0 1.008.54 1.404 1.44 1.404.63 0 1.044-.072 1.35-.198v1.998c-.45.198-.99.288-1.746.288-2.268 0-3.348-1.278-3.348-3.492Z'/><path fill='#000091' d='M46.992 19.098 31.998 10.42l-14.994 8.76a.606.606 0 0 0-.306.525v16.948a.666.666 0 0 0 .306.524l14.992 8.6 14.994-8.706a.666.666 0 0 0 .306-.524V19.626a.604.604 0 0 0-.304-.528Z'/><path fill='#FCC63A' d='m26.641 19.598-5.029 8.628-4.557-9.175 5.39-3.113 4.489 3.16-.293.5Zm20.656 16.98V19.62a.6.6 0 0 0-.306-.523L31.998 10.42'/><path fill='#0063CB' d='M16.7 36.578 32 10.42v35.362l-14.996-8.605a.665.665 0 0 1-.306-.524V19.706l.002 16.872Zm24.669-20.735 5.458 3.155-4.489 9.15-5.387-9.236 4.418-3.07Z'/><path fill='#fff' d='m51.606 16.303-19.19-11.02a.933.933 0 0 0-.832 0l-19.19 11.02a.887.887 0 0 0-.394.695v22a.885.885 0 0 0 .394.7l19.189 11.02a.932.932 0 0 0 .832 0l19.191-11.02a.886.886 0 0 0 .394-.7v-22a.887.887 0 0 0-.394-.695ZM22.789 34.059h.079c-.042 0-.079.007-.079.05 0 .1.151 0 .2.1a.912.912 0 0 0-.629.276c0 .05.1.05.151.05-.075.1-.226.05-.277.152a.176.176 0 0 0 .1.05c-.05 0-.1 0-.1.05v.152c-.126 0-.176.1-.277.15.2.152.327 0 .528 0-.528.2-.956.479-1.484.63-.1 0 0 .15-.1.15.151.1.227-.05.377-.05-.654.378-1.333.7-2.037 1.133a.351.351 0 0 0-.1.2h-.2c-.1.05-.05.176-.151.277.226.15.5-.2.654 0 .05 0-.1.05-.2.05-.05 0-.05.1-.1.1h-.154c-.1.075-.2.126-.2.276a.22.22 0 0 0-.226.1 9.031 9.031 0 0 0 3.144-.578 7.683 7.683 0 0 0 2.088-1.56.176.176 0 0 1 .05.1c-.147.437-.43.816-.806 1.08-.277.152-.478.378-.7.479a4.057 4.057 0 0 0-.428.276c-.632.197-1.281.335-1.939.412l-.305.044c-.225.033-.449.069-.671.108l-1.993-1.138a.647.647 0 0 1-.288-.411.57.57 0 0 0 .094-.063.266.266 0 0 0-.113-.071v-.65a12.782 12.782 0 0 0 3.038-.942 8.746 8.746 0 0 0-3.037-1.343v-1.515a11.67 11.67 0 0 1 1.639.392 6.42 6.42 0 0 1 1.182.578c.147.14.307.267.478.377a.91.91 0 0 0 .8.05h.33a3.961 3.961 0 0 0 1.937-.905c0 .05.05.05.1.05a3.629 3.629 0 0 1-.428 1.132c.003.05-.048.152.053.202Zm2.817 3.57c.251-.1.4-.276.629-.376-.05.05-.05.15-.1.2a3.699 3.699 0 0 0-.528.4 15.965 15.965 0 0 0-1.585 1.61c-.252.3-.528.578-.8.855-.096.09-.2.172-.31.245l-2.527-1.45c.36.03.721.013 1.076-.053.294-.083.58-.192.855-.327v.1c.7-.277 1.232-.906 1.937-1.132.025 0 .126.1.226.05a1.883 1.883 0 0 1 1.509-.7c0 .05 0 .1.05.1h.025c-.151.126-.327.25-.5.377-.057.052-.007.102.043.102Zm-8.908-6.163v-.186a5.817 5.817 0 0 1 1.588-.188 1.52 1.52 0 0 1 .478 0 5.86 5.86 0 0 0-2.066.374Zm30.6 5.088a.665.665 0 0 1-.306.524l-10.079 5.85a32.296 32.296 0 0 1-3.408-1.184 2.826 2.826 0 0 1-.05-2.245c.08-.308.198-.605.352-.883.025-.025.05-.05.05-.076a.025.025 0 0 0 .025-.025 4.32 4.32 0 0 1 .377-.555l.015-.015.02-.021.015-.015c0-.025.025-.05.05-.076.025-.051.075-.076.1-.126.176-.186.37-.354.579-.5.213-.077.431-.136.654-.177.811.06 1.617.17 2.415.328a.752.752 0 0 1 .277.1c.301.059.612.041.905-.05a1.137 1.137 0 0 0 .855-.706 1.212 1.212 0 0 0 .05-1.06c-.178-.275-.013-.436.181-.59l.068-.054c.086-.061.164-.134.231-.216.126-.252-.1-.4-.151-.63-.05-.1-.226-.05-.327-.2.352-.151.855-.43.629-.857-.151-.227-.377-.63-.1-.857.352-.2.855-.151 1.006-.48a1.137 1.137 0 0 0-.292-1.084l-.075-.108a4.754 4.754 0 0 1-.211-.32 6.905 6.905 0 0 0-.528-.757 4.297 4.297 0 0 1-.528-1.01c-.151-.377.05-.705.05-1.083a6.347 6.347 0 0 0-.327-2.144c-.126-.353-.176-.731-.327-1.06a1.12 1.12 0 0 0-.226-.58.374.374 0 0 1 0-.327c.205-.145.399-.305.579-.48a.567.567 0 0 0-.2-.705c-.327-.151-.3.328-.528.429h-.151c-.05-.126.05-.177.151-.277 0-.05 0-.151-.05-.151-.2 0-.377-.051-.428-.151a3.957 3.957 0 0 0-1.861-1.286c.188.058.382.091.579.1.338.071.69.036 1.006-.1.227-.076.277-.48.377-.706a.8.8 0 0 0-.151-.631 2.19 2.19 0 0 0-.906-.756 9.13 9.13 0 0 1-.679-.353.956.956 0 0 0-.251-.126c-2.965-1.485-9.069-.2-9.534 0h-.009a8.254 8.254 0 0 0-1.249.475 3.922 3.922 0 0 0-2.365 2.465 3.83 3.83 0 0 0-1.333 1.509c-.428.8-1.056 1.509-.956 2.414.1.78.277 1.484.428 2.289.043.272.11.54.2.8.1.276 0 .629.151.855.075.15.025.327.227.428v.2c.05.05.05.1.151.1v.2c.435.423.807.906 1.107 1.434.1.276-.478.15-.7.05a5.977 5.977 0 0 1-1.132-.956.176.176 0 0 0-.051.1c.2.352.906.78.528 1.006-.2.1-.428-.151-.629.05-.05.076 0 .177 0 .277-.277-.2-.578-.1-.855-.2-.2-.05-.252-.427-.478-.427a15.191 15.191 0 0 0-1.811-.327 15.144 15.144 0 0 0-1.739-.16V19.707a.606.606 0 0 1 .306-.524l14.987-8.761 14.994 8.677a.605.605 0 0 1 .306.524v16.932Zm-7.954-8.261a.325.325 0 0 1-.282.149 2.84 2.84 0 0 0-.282.273c.1 0 0 .149.1.149-.205.223.077.694-.205.793-.37.099-.758.099-1.127 0a.727.727 0 0 1 .167-.016h.085a.382.382 0 0 0 .337-.132v-.2c0-.05-.051-.05-.1-.05a.16.16 0 0 1-.1.05.223.223 0 0 0-.154-.2.806.806 0 0 1-.718-.273.67.67 0 0 1 .436-.05c.128 0 .077-.223.231-.322h.154c.307-.372.871-.471.974-.843 0-.1-.282-.1-.487-.15a2.26 2.26 0 0 0-.82.05c-.36.05-.712.142-1.051.274.28-.206.592-.365.923-.471.232-.09.473-.157.718-.2l.132-.026.133-.027a.97.97 0 0 1 .556 0c.231.1.615.1.666.248.1.273-.154.545-.435.744-.057.08.149.135.149.23Z'/><path fill='#FCC63A' d='M64.56 5H39a2 2 0 0 0-2 2v9.302a2 2 0 0 0 2 2h25.56a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2Z'/><path fill='#161616' d='M39.562 16.168V7.316h2.921c.97 0 1.732.236 2.289.708.565.472.847 1.117.847 1.935 0 .81-.282 1.45-.847 1.922-.557.472-1.32.708-2.289.708h-1.125v3.579h-1.796Zm2.997-7.322h-1.201v2.213h1.2c.38 0 .675-.097.886-.29.22-.195.329-.473.329-.836 0-.337-.11-.602-.329-.796-.21-.194-.506-.291-.885-.291ZM47.23 16.168V7.316h2.707c.97 0 1.736.236 2.301.708.565.472.847 1.117.847 1.935 0 .53-.126.995-.379 1.39-.244.389-.59.688-1.037.899l2.782 3.92h-2.15l-2.352-3.579h-.923v3.579h-1.795Zm2.808-7.322h-1.012v2.213h1.012c.38 0 .674-.097.885-.29.21-.195.316-.473.316-.836 0-.337-.105-.602-.316-.796-.21-.194-.506-.291-.885-.291ZM59.549 7.063c.69 0 1.323.126 1.896.38.582.252 1.08.59 1.492 1.011.414.421.734.919.962 1.492.227.565.341 1.164.341 1.796 0 .632-.114 1.235-.341 1.808a4.485 4.485 0 0 1-.962 1.48c-.413.421-.91.758-1.492 1.011a4.648 4.648 0 0 1-1.896.38 4.738 4.738 0 0 1-3.402-1.391 4.484 4.484 0 0 1-.961-1.48 4.855 4.855 0 0 1-.342-1.808c0-.633.114-1.231.342-1.796.227-.573.548-1.07.961-1.492.413-.422.91-.759 1.492-1.012a4.737 4.737 0 0 1 1.91-.379Zm0 7.676a2.8 2.8 0 0 0 1.138-.228c.354-.16.653-.37.898-.632.252-.27.45-.586.594-.949a3.27 3.27 0 0 0 .215-1.188 3.17 3.17 0 0 0-.215-1.176 2.791 2.791 0 0 0-.595-.949 2.548 2.548 0 0 0-.897-.632 2.673 2.673 0 0 0-1.138-.24c-.413 0-.797.08-1.151.24a2.678 2.678 0 0 0-.91.632 2.899 2.899 0 0 0-.582.949 3.17 3.17 0 0 0-.215 1.176c0 .421.071.817.215 1.188.143.363.337.679.581.949.253.261.557.472.91.632.355.152.739.228 1.152.228Z'/></g><defs><clipPath id='a'><path fill='#fff' d='M0 0h211v58H0z'/></clipPath></defs></svg>"); -} \ No newline at end of file From d8681b43a921d226a065d829c7f62e5b018f288e Mon Sep 17 00:00:00 2001 From: Alessandro Mosca Date: Tue, 21 Apr 2026 17:34:05 +0200 Subject: [PATCH 6/9] feat(proconnect): add sso_logout --- playground/app/core/configuration.py | 7 ++++-- playground/app/features/auth/state.py | 36 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/playground/app/core/configuration.py b/playground/app/core/configuration.py index 993acdfc8..663e6ceab 100644 --- a/playground/app/core/configuration.py +++ b/playground/app/core/configuration.py @@ -114,6 +114,9 @@ class Settings(ConfigBaseModel): playground_sso_opengatellm_admin_api_key: str | None = Field(default=None, description="To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens.") # fmt: off playground_sso_opengatellm_default_role_id: int | None = Field(default=None, description="To activate SSO, set the default role ID of OpenGateLLM API for new users.") # fmt: off + playground_sso_oauth2_proxy_url: str = Field(default="http://localhost:4180", description="The proxy url for SSO.") + playground_sso_provider_logout_url: str | None = Field(default= None, description="The logout url for SSO.") + playground_default_model: str | None = Field(default=None, description="The first model selected in chat page.") playground_theme_has_background: bool = Field(default=True, description="Whether the theme has a background.") playground_theme_accent_color: str = Field(default="purple", description="The primary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors.") # fmt: off @@ -134,8 +137,8 @@ def validate_sso_enabled(self): raise ValueError("SSO is enabled but no OpenGateLLM API key with ADMIN permissions is provided.") if self.playground_sso_opengatellm_default_role_id is None: raise ValueError("SSO is enabled but no default role ID is provided.") - return self - + if self.playground_sso_provider_logout_url is None: + raise ValueError("SSO is enabled but no logout url is provided.") class ConfigFile(ConfigBaseModel): """ diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index 43458a13a..af821a65f 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -1,5 +1,6 @@ import httpx import reflex as rx +from urllib3.contrib.emscripten import response from app.core.configuration import configuration from app.shared.components.toasts import httpx_error_toast @@ -33,6 +34,8 @@ class AuthState(rx.State): opengatellm_timeout: int = configuration.settings.playground_opengatellm_timeout sso_opengatellm_admin_api_key: str | None = configuration.settings.playground_sso_opengatellm_admin_api_key sso_opengatellm_default_role_id: int | None = configuration.settings.playground_sso_opengatellm_default_role_id + sso_oauth2_proxy_url: str = configuration.settings.playground_sso_oauth2_proxy_url + sso_provider_logout_url: str = configuration.settings.playground_sso_provider_logout_url # Form fields email_input: str = "" @@ -219,3 +222,36 @@ def logout(self): self.user_updated = None self.user_permissions = [] self.user_limits = [] + + @rx.event + async def sso_logout(self): + """Handle logout.""" + try: + async with httpx.AsyncClient() as client: + response = await client.get( + url=f"{self.sso_oauth2_proxy_url}/oauth2/sign_out", + params={"rd" : self.sso_provider_logout_url}, + timeout=self.opengatellm_timeout, + ) + response.raise_for_status() + + self.is_authenticated = False + self.user_id = None + self.user_email = None + self.user_name = None + self.api_key = None + self.api_key_id = None + self.user_organization = None + self.user_budget = None + self.user_priority = None + self.user_created = None + self.user_updated = None + self.user_permissions = [] + self.user_limits = [] + + except Exception as e: + yield httpx_error_toast(exception=e, response=response) + + finally: + self.is_loading = False + yield From 9f7a733879d78f66624a021744db5ce43c859f1f Mon Sep 17 00:00:00 2001 From: Alessandro Mosca Date: Wed, 22 Apr 2026 11:33:06 +0200 Subject: [PATCH 7/9] feat(sso): add logout --- playground/app/core/configuration.py | 6 ++- playground/app/features/auth/state.py | 50 +++++++------------ .../navigation/components/sidebars.py | 6 ++- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/playground/app/core/configuration.py b/playground/app/core/configuration.py index 663e6ceab..770d11a2d 100644 --- a/playground/app/core/configuration.py +++ b/playground/app/core/configuration.py @@ -138,7 +138,10 @@ def validate_sso_enabled(self): if self.playground_sso_opengatellm_default_role_id is None: raise ValueError("SSO is enabled but no default role ID is provided.") if self.playground_sso_provider_logout_url is None: - raise ValueError("SSO is enabled but no logout url is provided.") + raise ValueError("SSO is enabled but no provider logout url is provided.") + if self.playground_sso_oauth2_proxy_url is None: + raise ValueError("SSO is enabled but no oauth2 proxy url is provided.") + return self class ConfigFile(ConfigBaseModel): """ @@ -164,6 +167,7 @@ def config_file_exists(cls, config_file): return config_file @model_validator(mode="after") + @classmethod def setup_config(cls, values) -> Any: with open(file=values.config_file) as file: lines = file.readlines() diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index af821a65f..4cb47b83c 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -1,6 +1,5 @@ import httpx import reflex as rx -from urllib3.contrib.emscripten import response from app.core.configuration import configuration from app.shared.components.toasts import httpx_error_toast @@ -32,6 +31,7 @@ class AuthState(rx.State): opengatellm_url: str = configuration.settings.playground_opengatellm_url opengatellm_timeout: int = configuration.settings.playground_opengatellm_timeout + sso_enabled: bool = configuration.settings.playground_sso_enabled sso_opengatellm_admin_api_key: str | None = configuration.settings.playground_sso_opengatellm_admin_api_key sso_opengatellm_default_role_id: int | None = configuration.settings.playground_sso_opengatellm_default_role_id sso_oauth2_proxy_url: str = configuration.settings.playground_sso_oauth2_proxy_url @@ -224,34 +224,22 @@ def logout(self): self.user_limits = [] @rx.event - async def sso_logout(self): - """Handle logout.""" - try: - async with httpx.AsyncClient() as client: - response = await client.get( - url=f"{self.sso_oauth2_proxy_url}/oauth2/sign_out", - params={"rd" : self.sso_provider_logout_url}, - timeout=self.opengatellm_timeout, - ) - response.raise_for_status() - - self.is_authenticated = False - self.user_id = None - self.user_email = None - self.user_name = None - self.api_key = None - self.api_key_id = None - self.user_organization = None - self.user_budget = None - self.user_priority = None - self.user_created = None - self.user_updated = None - self.user_permissions = [] - self.user_limits = [] - - except Exception as e: - yield httpx_error_toast(exception=e, response=response) + def sso_logout(self): + """Handle SSO logout by redirecting the browser to oauth2-proxy sign_out. - finally: - self.is_loading = False - yield + oauth2-proxy clears the session cookie then redirects to the provider logout URL. + """ + self.is_authenticated = False + self.user_id = None + self.user_email = None + self.user_name = None + self.api_key = None + self.api_key_id = None + self.user_organization = None + self.user_budget = None + self.user_priority = None + self.user_created = None + self.user_updated = None + self.user_permissions = [] + self.user_limits = [] + return rx.redirect(f"{self.sso_oauth2_proxy_url}/oauth2/sign_out?rd={self.sso_provider_logout_url}") diff --git a/playground/app/features/navigation/components/sidebars.py b/playground/app/features/navigation/components/sidebars.py index 899b8d9bc..189e51066 100644 --- a/playground/app/features/navigation/components/sidebars.py +++ b/playground/app/features/navigation/components/sidebars.py @@ -103,7 +103,11 @@ def navigation_sidebar() -> rx.Component: rx.button( rx.icon("log-out", size=16), "Logout", - on_click=AuthState.logout, + on_click=rx.cond( + AuthState.sso_enabled, + AuthState.sso_logout, + AuthState.logout, + ), variant="soft", color_scheme="red", width="100%", From a90ad933fb46a7f74963455983437623499086aa Mon Sep 17 00:00:00 2001 From: leoguillaume Date: Thu, 23 Apr 2026 15:50:40 +0200 Subject: [PATCH 8/9] wip --- .gitignore | 1 + api/schemas/core/configuration.py | 9 ++-- playground/app/core/configuration.py | 50 ++++++++++--------- playground/app/features/auth/state.py | 12 +++-- .../navigation/components/sidebars.py | 4 +- scripts/docs/configuration_header.md | 1 + .../generate_configuration_documentation.py | 18 +++++++ 7 files changed, 61 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 52d0b8157..d5bbd089a 100644 --- a/.gitignore +++ b/.gitignore @@ -216,6 +216,7 @@ playground/.gitignore playground/requirements.txt run.sh .claude +.cursor bruno docs/.astro docs/node_modules diff --git a/api/schemas/core/configuration.py b/api/schemas/core/configuration.py index e02938deb..9569a8f17 100644 --- a/api/schemas/core/configuration.py +++ b/api/schemas/core/configuration.py @@ -22,7 +22,6 @@ def custom_validation_error(suffix: str = ""): - # TODO: surcharge url pour playground """ Decorator to override Pydantic ValidationError to change error message. @@ -270,10 +269,10 @@ class EmptyDependency(ConfigBaseModel): @custom_validation_error() class Dependencies(ConfigBaseModel): - albert: AlbertDependency | None = Field(default=None, description="**[DEPRECATED]** See the [AlbertDependency section](#albertdependency) for more information.") # fmt: off - celery: CeleryDependency | None = Field(default=None, description="**[DEPRECATED]** See the [CeleryDependency section](#celerydependency) for more information.") # fmt: off + albert: AlbertDependency | None = Field(default=None, description="**[DEPRECATED]** See the [AlbertDependency section](#albertdependency) for more information.", json_schema_extra={"deprecated": True}) # fmt: off + celery: CeleryDependency | None = Field(default=None, description="**[DEPRECATED]** See the [CeleryDependency section](#celerydependency) for more information.", json_schema_extra={"deprecated": True}) # fmt: off elasticsearch: ElasticsearchDependency | None = Field(default=None, description="See the [ElasticsearchDependency section](#elasticsearchdependency) for more information.") # fmt: off - marker: MarkerDependency | None = Field(default=None, description="**[DEPRECATED]** See the [MarkerDependency section](#markerdependency) for more information.") # fmt: off + marker: MarkerDependency | None = Field(default=None, description="**[DEPRECATED]** See the [MarkerDependency section](#markerdependency) for more information.", json_schema_extra={"deprecated": True}) # fmt: off postgres: PostgresDependency = Field(..., description="See the [PostgresDependency section](#postgresdependency) for more information.") # fmt: off redis: RedisDependency = Field(..., description="See the [RedisDependency section](#redisdependency) for more information.") # fmt: off sentry: SentryDependency | None = Field(default=None, description="See the [SentryDependency section](#sentrydependency) for more information.") # fmt: off @@ -382,7 +381,7 @@ class Settings(ConfigBaseModel): swagger_redoc_url: str = Field(default="/redoc", pattern=r"^/", description="Redoc URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information.") # fmt: off # auth - auth_master_key: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(default="changeme", description="[DEPRECATED] Master key for the API. It should be a random string with at least 32 characters. This key has all permissions and cannot be modified or deleted. This key is used to create the first role and the first user.") # fmt: off + auth_master_key: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(default="changeme", description="[DEPRECATED] Master key for the API. It should be a random string with at least 32 characters. This key has all permissions and cannot be modified or deleted. This key is used to create the first role and the first user.", json_schema_extra={"deprecated": True}) # fmt: off auth_secret_key: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] | None = Field(default=None, description="Secret key for the API. It should be a random string with at least 32 characters. This key is used to encrypt user tokens, watch out if you modify the secret key, you'll need to update all user API keys. If not provided, the master key will be used.") # fmt: off auth_default_username: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(default="admin", description="Username of the admin user created at startup.") # fmt: off auth_default_password: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(default="changeme", description="Password of the admin user created at startup.") # fmt: off diff --git a/playground/app/core/configuration.py b/playground/app/core/configuration.py index 770d11a2d..851e57099 100644 --- a/playground/app/core/configuration.py +++ b/playground/app/core/configuration.py @@ -2,9 +2,9 @@ import logging import os import re -from typing import Any, get_args, get_origin +from typing import Annotated, Any, Literal, get_args, get_origin -from pydantic import BaseModel, ConfigDict, Field, constr, field_validator, model_validator +from pydantic import BaseModel, ConfigDict, Field, StringConstraints, constr, field_validator, model_validator from pydantic import ValidationError as PydanticValidationError from pydantic_settings import BaseSettings import yaml @@ -102,22 +102,15 @@ class Dependencies(ConfigBaseModel): @custom_validation_error(suffix="-1") -class Settings(ConfigBaseModel): +class Settings(BaseModel): auth_key_max_expiration_days: int | None = Field(default=None, ge=1, description="Maximum number of days for a token to be valid.") # fmt: off routing_max_priority: int = Field(default=10, ge=0, description="Maximum allowed priority in routing tasks.") # fmt: off app_title: str = Field(default=DEFAULT_APP_NAME, description="The title of the application.") playground_opengatellm_url: str = Field(default="http://localhost:8000", description="The URL of the OpenGateLLM API.") playground_opengatellm_timeout: int = Field(default=60, description="The timeout in seconds for the OpenGateLLM API.") - - playground_sso_enabled: bool = Field(default=False, description="Whether SSO is enabled.") - playground_sso_opengatellm_admin_api_key: str | None = Field(default=None, description="To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens.") # fmt: off - playground_sso_opengatellm_default_role_id: int | None = Field(default=None, description="To activate SSO, set the default role ID of OpenGateLLM API for new users.") # fmt: off - - playground_sso_oauth2_proxy_url: str = Field(default="http://localhost:4180", description="The proxy url for SSO.") - playground_sso_provider_logout_url: str | None = Field(default= None, description="The logout url for SSO.") - playground_default_model: str | None = Field(default=None, description="The first model selected in chat page.") + playground_theme_has_background: bool = Field(default=True, description="Whether the theme has a background.") playground_theme_accent_color: str = Field(default="purple", description="The primary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors.") # fmt: off playground_theme_appearance: str = Field(default="light", description="The appearance of the theme.") @@ -130,18 +123,20 @@ class Settings(ConfigBaseModel): reference_url: str | None = Field(default="http://localhost:8000/redoc", pattern=r"^http[s]?://", description="Reference URL. If not provided, deactivated reference link in the navigation bar.") # fmt: off documentation_url: str | None = Field(default="https://docs.opengatellm.org", pattern=r"^http[s]?://", description="Documentation URL. If not provided, deactivated documentation link in the navigation bar.") # fmt: off - @model_validator(mode="after") - def validate_sso_enabled(self): - if self.playground_sso_enabled: - if self.playground_sso_opengatellm_admin_api_key is None: - raise ValueError("SSO is enabled but no OpenGateLLM API key with ADMIN permissions is provided.") - if self.playground_sso_opengatellm_default_role_id is None: - raise ValueError("SSO is enabled but no default role ID is provided.") - if self.playground_sso_provider_logout_url is None: - raise ValueError("SSO is enabled but no provider logout url is provided.") - if self.playground_sso_oauth2_proxy_url is None: - raise ValueError("SSO is enabled but no oauth2 proxy url is provided.") - return self + +class SettingsWithoutSSO(Settings): + playground_sso_enabled: Literal[False] = Field(default=False, description="Whether SSO is enabled.") + playground_sso_opengatellm_admin_api_key: Any = Field(default=None, description="To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens.") # fmt: off + playground_sso_opengatellm_default_role_id: Any = Field(default=None, description="To activate SSO, set the default role ID of OpenGateLLM API for new users.") # fmt: off + playground_sso_provider_logout_url: Any = Field(default=None, description="The logout url for SSO.") + + +class SettingsWithSSO(Settings): + playground_sso_enabled: Literal[True] = Field(default=True, description="Whether SSO is enabled.") + playground_sso_opengatellm_admin_api_key: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(description="To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens.") # fmt: off + playground_sso_opengatellm_default_role_id: Annotated[int, Field(ge=0, description="To activate SSO, set the default role ID of OpenGateLLM API for new users.")] = Field(description="To activate SSO, set the default role ID of OpenGateLLM API for new users.") # fmt: off + playground_sso_provider_logout_url: Annotated[str, StringConstraints(strip_whitespace=True, min_length=1)] = Field(description="The logout url for SSO.") # fmt: off + class ConfigFile(ConfigBaseModel): """ @@ -153,7 +148,14 @@ class ConfigFile(ConfigBaseModel): """ dependencies: Dependencies = Field(default_factory=Dependencies, description="Dependencies used by the playground.") # fmt: off - settings: Settings = Field(default_factory=Settings, description="General settings configuration fields. Some fields are common to the API and the playground.") # fmt: off + settings: Annotated[SettingsWithoutSSO | SettingsWithSSO, Field(discriminator="playground_sso_enabled", default_factory=SettingsWithoutSSO, description="General settings configuration fields. Some fields are common to the API and the playground.")] # fmt: off + + @model_validator(mode="before") + @classmethod + def normalize(cls, data: Any) -> Any: + if isinstance(data, dict) and isinstance(data.get("settings"), dict): + data["settings"].setdefault("playground_sso_enabled", False) + return data class Configuration(BaseSettings): diff --git a/playground/app/features/auth/state.py b/playground/app/features/auth/state.py index 4cb47b83c..9dbe7c175 100644 --- a/playground/app/features/auth/state.py +++ b/playground/app/features/auth/state.py @@ -1,3 +1,5 @@ +from urllib.parse import quote + import httpx import reflex as rx @@ -34,7 +36,6 @@ class AuthState(rx.State): sso_enabled: bool = configuration.settings.playground_sso_enabled sso_opengatellm_admin_api_key: str | None = configuration.settings.playground_sso_opengatellm_admin_api_key sso_opengatellm_default_role_id: int | None = configuration.settings.playground_sso_opengatellm_default_role_id - sso_oauth2_proxy_url: str = configuration.settings.playground_sso_oauth2_proxy_url sso_provider_logout_url: str = configuration.settings.playground_sso_provider_logout_url # Form fields @@ -207,7 +208,7 @@ def is_master(self) -> bool: return self.user_id == 0 @rx.event - def logout(self): + def basic_logout(self): """Handle logout.""" self.is_authenticated = False self.user_id = None @@ -242,4 +243,9 @@ def sso_logout(self): self.user_updated = None self.user_permissions = [] self.user_limits = [] - return rx.redirect(f"{self.sso_oauth2_proxy_url}/oauth2/sign_out?rd={self.sso_provider_logout_url}") + + # return rx.redirect(rd) + # client_id = "557aea18a617ec6a06260ec42015f26251d671f3914a7312e6b168dc4e4f738e" + # url = f"https://fca.integ01.dev-agentconnect.fr/api/v2/session/end?client_id={client_id}&post_logout_redirect_uri=http%3A%2F%2Flocalhost:4180/oauth2/sign_in" + # return rx.redirect(urljoin(base=self.sso_oauth2_proxy_url, url=f"/oauth2/sign_out?rd={rd}")) + return rx.redirect(quote(self.sso_provider_logout_url, safe="")) diff --git a/playground/app/features/navigation/components/sidebars.py b/playground/app/features/navigation/components/sidebars.py index 189e51066..adb50442f 100644 --- a/playground/app/features/navigation/components/sidebars.py +++ b/playground/app/features/navigation/components/sidebars.py @@ -106,7 +106,7 @@ def navigation_sidebar() -> rx.Component: on_click=rx.cond( AuthState.sso_enabled, AuthState.sso_logout, - AuthState.logout, + AuthState.basic_logout, ), variant="soft", color_scheme="red", @@ -127,7 +127,7 @@ def navigation_sidebar() -> rx.Component: width="250px", height="94%", background_color=rx.color("mauve", 2), - border_right=f"1px solid {rx.color("mauve", 3)}", + border_right=f"1px solid {rx.color('mauve', 3)}", position="fixed", left="0", top="65px", diff --git a/scripts/docs/configuration_header.md b/scripts/docs/configuration_header.md index ac9f43e1b..dc04a2d76 100644 --- a/scripts/docs/configuration_header.md +++ b/scripts/docs/configuration_header.md @@ -4,6 +4,7 @@ sidebar: label: "[lucide:file-text] Configuration file" order: 0 --- +import { Tabs } from '@astrojs/starlight/components'; OpenGateLLM requires configuring a configuration file. This defines models, dependencies, and settings parameters. Playground and API need a configuration file (could be the same file), see [API configuration](#api-configuration) and [Playground configuration](#playground-configuration). diff --git a/scripts/docs/generate_configuration_documentation.py b/scripts/docs/generate_configuration_documentation.py index 0c7ed0ca3..fa2c6e41d 100644 --- a/scripts/docs/generate_configuration_documentation.py +++ b/scripts/docs/generate_configuration_documentation.py @@ -26,6 +26,7 @@ def get_documentation_data(title: str, data: list, properties: dict, defs: dict, for property in sorted(properties): description = properties[property].get("description", "") description = description.replace("|", "\\|") + default = properties[property].get("default", properties[property].get("default", "**required**")) default = f"`{default}`" if default != "**required**" else "**required**" @@ -35,6 +36,23 @@ def get_documentation_data(title: str, data: list, properties: dict, defs: dict, if "anyOf" in properties[property]: properties[property].update(properties[property]["anyOf"][0]) + if "oneOf" in properties[property]: + for one_of in properties[property]["oneOf"]: + ref_key = one_of.get("$ref").split("/")[-1] + ref = defs[ref_key] + type = ref.get("type", "") + values = ref.get("enum", []) + + if "properties" in ref: + data = get_documentation_data( + title=ref_key, + data=data, + properties=ref["properties"], + defs=defs, + header=ref.get("description"), + level=level + 1, + ) + if "$ref" in properties[property]: ref_key = properties[property]["$ref"].split("/")[-1] ref = defs[ref_key] From 7e45d8b8c07d2706ef49ba0aa6d5b3fa9096ced9 Mon Sep 17 00:00:00 2001 From: leoguillaume Date: Thu, 23 Apr 2026 16:33:36 +0200 Subject: [PATCH 9/9] wip --- api/schemas/core/configuration.py | 16 +- .../docs/configuration/configuration_file.md | 375 --------------- .../docs/configuration/configuration_file.mdx | 454 ++++++++++++++++++ scripts/docs/configuration_header.md | 2 +- .../generate_configuration_documentation.py | 355 +++++++++----- 5 files changed, 690 insertions(+), 512 deletions(-) delete mode 100644 docs/src/content/docs/configuration/configuration_file.md create mode 100644 docs/src/content/docs/configuration/configuration_file.mdx diff --git a/api/schemas/core/configuration.py b/api/schemas/core/configuration.py index 9569a8f17..6d342c77a 100644 --- a/api/schemas/core/configuration.py +++ b/api/schemas/core/configuration.py @@ -145,8 +145,6 @@ class Model(ConfigBaseModel): serve the same type of model (text-generation or text-embeddings-inference, etc.). We recommend that all providers of a model serve exactly the same model, otherwise users may receive responses of varying quality. For embedding models, the API verifies that all providers output vectors of the same dimension. You can define the load balancing strategy between the model's providers. By default, it is random. - - For more information to configure model providers, see the [ModelProvider section](#modelprovider). """ name: constr(strip_whitespace=True, min_length=1, max_length=64) = Field(..., description="Unique name exposed to clients when selecting the model.", examples=["gpt-4o"]) # fmt: off @@ -269,13 +267,13 @@ class EmptyDependency(ConfigBaseModel): @custom_validation_error() class Dependencies(ConfigBaseModel): - albert: AlbertDependency | None = Field(default=None, description="**[DEPRECATED]** See the [AlbertDependency section](#albertdependency) for more information.", json_schema_extra={"deprecated": True}) # fmt: off - celery: CeleryDependency | None = Field(default=None, description="**[DEPRECATED]** See the [CeleryDependency section](#celerydependency) for more information.", json_schema_extra={"deprecated": True}) # fmt: off - elasticsearch: ElasticsearchDependency | None = Field(default=None, description="See the [ElasticsearchDependency section](#elasticsearchdependency) for more information.") # fmt: off - marker: MarkerDependency | None = Field(default=None, description="**[DEPRECATED]** See the [MarkerDependency section](#markerdependency) for more information.", json_schema_extra={"deprecated": True}) # fmt: off - postgres: PostgresDependency = Field(..., description="See the [PostgresDependency section](#postgresdependency) for more information.") # fmt: off - redis: RedisDependency = Field(..., description="See the [RedisDependency section](#redisdependency) for more information.") # fmt: off - sentry: SentryDependency | None = Field(default=None, description="See the [SentryDependency section](#sentrydependency) for more information.") # fmt: off + albert: AlbertDependency | None = Field(default=None, json_schema_extra={"deprecated": True}) # fmt: off + celery: CeleryDependency | None = Field(default=None, json_schema_extra={"deprecated": True}) # fmt: off + elasticsearch: ElasticsearchDependency | None = Field(default=None, description="Elasticsearch is an optional dependency of OpenGateLLM. Elasticsearch is used as a vector store. If this dependency is provided, all documents endpoint are enabled.") # fmt: off + marker: MarkerDependency | None = Field(default=None, json_schema_extra={"deprecated": True}) # fmt: off + postgres: PostgresDependency = Field(..., description="Postgres is a required dependency of OpenGateLLM to store API data.") # fmt: off + redis: RedisDependency = Field(..., description="Redis is a required dependency of OpenGateLLM to store rate limiting counters and performance metrics.") # fmt: off + sentry: SentryDependency | None = Field(default=None, description="Sentry is an optional dependency of OpenGateLLM. Sentry helps you identify, diagnose, and fix errors in real-time.") # fmt: off @model_validator(mode="after") def complete_celery(self): diff --git a/docs/src/content/docs/configuration/configuration_file.md b/docs/src/content/docs/configuration/configuration_file.md deleted file mode 100644 index cd4ae32ec..000000000 --- a/docs/src/content/docs/configuration/configuration_file.md +++ /dev/null @@ -1,375 +0,0 @@ ---- -title: Configuration file -sidebar: - label: "[lucide:file-text] Configuration file" - order: 0 ---- - -OpenGateLLM requires configuring a configuration file. This defines models, dependencies, and settings parameters. Playground and API need a configuration file (could be the same file), see [API configuration](#api-configuration) and [Playground configuration](#playground-configuration). - -By default, the configuration file must be `./config.yml` file. - -You can change the configuration file by setting the `CONFIG_FILE` environment variable. - -## Secrets - -You can pass environment variables in configuration file with pattern `${ENV_VARIABLE_NAME}`. All environment variables will be loaded in the configuration file. - -**Example** - -```yaml -models: - [...] - - name: my-language-model - type: text-generation - providers: - - type: openai - url: https://api.openai.com - key: ${OPENAI_API_KEY} - model_name: gpt-4o-mini -``` - -## Example - -The following is an example of configuration file: - -```yaml -# ----------------------------------- models ------------------------------------ -models: - - name: albert-testbed - type: text-generation - # aliases: ["model-alias"] - # owned_by: Me - # load_balancing_strategy: shuffle - # cost_prompt_tokens: 0.10 - # cost_completion_tokens: 0.10 - providers: - - type: vllm - url: http://albert-testbed.etalab.gouv.fr:8000 - # key: sk-xxx - model_name: "gemma3:1b" - # timeout: 60 - # model_hosting_zone: FRA - # model_total_params: 8 - # model_active_params: 8 - -# -------------------------------- dependencies --------------------------------- -dependencies: - postgres: # required - url: postgresql+asyncpg://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-localhost}:${POSTGRES_PORT:-5432}/postgres - echo: False - pool_size: 5 - connect_args: - server_settings: - statement_timeout: "120s" - command_timeout: 60 - - redis: # required - url: redis://:${REDIS_PASSWORD:-changeme}@${REDIS_HOST:-localhost}:${REDIS_PORT:-6379} - max_connections: 200 - socket_connect_timeout: 5 - retry_on_timeout: True - health_check_interval: 30 - decode_responses: False - socket_keepalive: True - - elasticsearch: # optional - index_name: opengatellm - index_language: english - number_of_shards: 1 - index_name: "opengatellm" - number_of_replicas: 0 - hosts: "http://${ELASTICSEARCH_HOST:-localhost}:${ELASTICSEARCH_PORT:-9200}" - basic_auth: - - "elastic" - - ${ELASTICSEARCH_PASSWORD} - - # sentry: - # dsn: ${SENTRY_DSN} - -# ---------------------------------- settings ----------------------------------- -settings: - # disabled_routers: ["admin", "audio"] - # hidden_routers: ["auth"] - # usage_tokenizer: tiktoken_gpt2 - # app_title: My OpenGateLLM API - - # log_level: INFO - # log_format: [%(asctime)s][%(process)d:%(name)s][%(levelname)s] %(client_ip)s - %(message)s - - swagger_version: 0.4.2 - # swagger_contact_url: https://github.com/etalab-ia/OpenGateLLM - # swagger_contact_email: john.doe@example.com - # swagger_docs_url: /docs - # swagger_redoc_url: /redoc - - auth_master_key: changeme # DEPRECATED, use auth_secret_key instead - auth_secret_key: changeme - - auth_default_username: admin - auth_default_password: changeme - - # rate_limiting_strategy: fixed_window - - # monitoring_sentry_enabled: True - # monitoring_postgres_enabled: True - # monitoring_prometheus_enabled: True - - # vector_store_model: my-model - - # search_multi_agents_synthesis_model: my-model - # search_multi_agents_reranker_model: my-model - - playground_opengatellm_url: ${OPENGATELLM_URL} - # playground_default_model: my-model - # playground_theme_has_background: True - # playground_theme_accent_color: purple - # playground_theme_appearance: dark - # playground_theme_gray_color: gray - # playground_theme_panel_background: solid - # playground_theme_radius: medium - # playground_theme_scaling: 100% - -``` - -## API configuration -Configuration file is composed of 3 sections, models: -- `models`: to declare models API exposed to the API. -- `dependencies`: to declare both required plugins for the API (e.g. PostgreSQL, Redis) and optional ones (e.g. Elasticsearch). -- `settings`: to configure the API. - -:::warnings -We don't recommend to use the configuration file to declare models, prefer to use the API to declare models, by endpoints or on the Playground UI (see [Models configuration](/getting-started/models/)). -::: -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| dependencies | object | Dependencies used by the API. For details of configuration, see the [Dependencies section](#dependencies). | **required** | | | -| models | array | Models used by the API. For details of configuration, see the [Model section](#model). | **required** | | | -| settings | object | For details of configuration, see the [Settings section](#settings). | **required** | | | - -

- -### Settings -General settings configuration fields. -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| app_title | string | Display title of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `OpenGateLLM` | | `My API` | -| auth_key_max_expiration_days | integer | Maximum number of days for a new API key to be valid. | `None` | | | -| auth_master_key | string | Master key for the API. It should be a random string with at least 32 characters. This key has all permissions and cannot be modified or deleted. This key is used to create the first role and the first user. This key is also used to encrypt user tokens, watch out if you modify the master key, you'll need to update all user API keys. | `changeme` | | | -| auth_playground_session_duration | integer | Duration of the playground postgres_session in seconds. | `3600` | | | -| disabled_routers | array | Disabled routers to limits services of the API. | `[]` | • `admin`

• `audio`

• `auth`

• `chat`

• `chunks`

• `collections`

• `documents`

• `embeddings`

• ... | `['embeddings']` | -| document_parsing_max_concurrent | integer | Maximum number of concurrent document parsing tasks per worker. | `10` | | | -| front_url | string | Front-end URL for the application. | `http://localhost:8501` | | | -| hidden_routers | array | Routers are enabled but hidden in the swagger and the documentation of the API. | `[]` | • `admin`

• `audio`

• `auth`

• `chat`

• `chunks`

• `collections`

• `documents`

• `embeddings`

• ... | `['admin']` | -| log_format | string | Logging format of the API. | `[%(asctime)s][%(process)d:%(name)s][%(levelname)s] %(client_ip)s - %(message)s` | | | -| log_level | string | Logging level of the API. | `INFO` | • `DEBUG`

• `INFO`

• `WARNING`

• `ERROR`

• `CRITICAL` | | -| monitoring_postgres_enabled | boolean | If true, the log usage will be written in the PostgreSQL database. | `True` | | | -| monitoring_prometheus_enabled | boolean | If true, Prometheus metrics will be exposed in the `/metrics` endpoint. | `True` | | | -| rate_limiting_strategy | string | Rate limiting strategy for the API. | `fixed_window` | • `moving_window`

• `fixed_window`

• `sliding_window` | | -| routing_max_priority | integer | Maximum allowed priority in routing tasks. | `4` | | | -| routing_max_retries | integer | Maximum number of retries for routing tasks. | `3` | | | -| routing_retry_countdown | integer | Number of seconds before retrying a failed routing task. | `3` | | | -| session_secret_key | string | Secret key for postgres_session middleware. If not provided, the master key will be used. | `None` | | `knBnU1foGtBEwnOGTOmszldbSwSYLTcE6bdibC8bPGM` | -| swagger_contact | object | Contact informations of the API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `None` | | | -| swagger_description | string | Display description of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `[See documentation](https://github.com/etalab-ia/opengatellm/blob/main/README.md)` | | `[See documentation](https://github.com/etalab-ia/opengatellm/blob/main/README.md)` | -| swagger_docs_url | string | Docs URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `/docs` | | | -| swagger_license_info | object | Licence informations of the API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `{'name': 'MIT Licence', 'identifier': 'MIT', 'url': 'https://raw.githubusercontent.com/etalab-ia/opengatellm/refs/heads/main/LICENSE'}` | | | -| swagger_openapi_tags | array | OpenAPI tags of the API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `[]` | | | -| swagger_openapi_url | string | OpenAPI URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `/openapi.json` | | | -| swagger_redoc_url | string | Redoc URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `/redoc` | | | -| swagger_summary | string | Display summary of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `OpenGateLLM connect to your models. You can configuration this swagger UI in the configuration file, like hide routes or change the title.` | | `My API description.` | -| swagger_terms_of_service | string | A URL to the Terms of Service for the API in swagger UI. If provided, this has to be a URL. | `None` | | `https://example.com/terms-of-service` | -| swagger_version | string | Display version of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | `latest` | | `2.5.0` | -| usage_tokenizer | string | Tokenizer used to compute usage of the API. | `tiktoken_gpt2` | • `tiktoken_gpt2`

• `tiktoken_r50k_base`

• `tiktoken_p50k_base`

• `tiktoken_p50k_edit`

• `tiktoken_cl100k_base`

• `tiktoken_o200k_base` | | -| vector_store_model | string | Model used to vectorize the text in the vector store database. Is required if a vector store dependency is provided (Elasticsearch). This model must be defined in the `models` section and have type `text-embeddings-inference`. | `None` | | | - -

- -### Model -In the models section, you define a list of models. Each model is a set of API providers for that model. Users will access the models specified in -this section using their *name*. Load balancing is performed between the different providers of the requested model. All providers in a model must -serve the same type of model (text-generation or text-embeddings-inference, etc.). We recommend that all providers of a model serve exactly the same -model, otherwise users may receive responses of varying quality. For embedding models, the API verifies that all providers output vectors of the -same dimension. You can define the load balancing strategy between the model's providers. By default, it is random. - -For more information to configure model providers, see the [ModelProvider section](#modelprovider). -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| aliases | array | Aliases of the model. It will be used to identify the model by users. | `[]` | | `['model-alias', 'model-alias-2']` | -| cost_completion_tokens | number | Model costs completion tokens for user budget computation. The cost is by 1M tokens. Set to `0.0` to disable budget computation for this model. | `0.0` | | `0.1` | -| cost_prompt_tokens | number | Model costs prompt tokens for user budget computation. The cost is by 1M tokens. | `0.0` | | `0.1` | -| load_balancing_strategy | string | Routing strategy for load balancing between providers of the model. | `shuffle` | • `shuffle`

• `least_busy` | `least_busy` | -| name | string | Unique name exposed to clients when selecting the model. | **required** | | `gpt-4o` | -| providers | array | API providers of the model. If there are multiple providers, the model will be load balanced between them according to the routing strategy. The different models have to the same type. For details of configuration, see the [ModelProvider section](#modelprovider). | **required** | | | -| type | string | Type of the model. It will be used to identify the model type. | **required** | • `automatic-speech-recognition`

• `image-text-to-text`

• `image-to-text`

• `text-embeddings-inference`

• `text-generation`

• `text-classification` | `text-generation` | - -

- -#### ModelProvider -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| key | string | Model provider API key. | `None` | | `sk-1234567890` | -| model_active_params | integer | Active params of the model in billions of parameters for carbon footprint computation. For more information, see https://ecologits.ai | `0` | | `8` | -| model_hosting_zone | string | Model hosting zone using ISO 3166-1 alpha-3 code format (e.g., `WOR` for World, `FRA` for France, `USA` for United States). This determines the electricity mix used for carbon intensity calculations. For more information, see https://ecologits.ai | `WOR` | • `ABW`

• `AFG`

• `AGO`

• `AIA`

• `ALA`

• `ALB`

• `AND`

• `ARE`

• ... | `WOR` | -| model_name | string | Model name from the model provider. | **required** | | `gpt-4o` | -| model_total_params | integer | Total params of the model in billions of parameters for carbon footprint computation. For more information, see https://ecologits.ai | `0` | | `8` | -| qos_limit | number | The value to use for the quality of service. Depends of the metric, the value can be a percentile, a threshold, etc. | `None` | | `0.5` | -| qos_metric | string | The metric to use for the quality of service. If not provided, no QoS policy is applied. | `None` | • `ttft`

• `latency`

• `inflight`

• `performance` | `inflight` | -| timeout | integer | Timeout for the model provider requests, after user receive an 500 error (model is too busy). | `300` | | `10` | -| type | string | Model provider type. | **required** | • `albert`

• `openai`

• `mistral`

• `tei`

• `vllm` | `openai` | -| url | string | Model provider API url. The url must only contain the domain name (without `/v1` suffix for example). Depends of the model provider type, the url can be optional (Albert, OpenAI). | `None` | | `https://api.openai.com` | - -

- -### Dependencies -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| albert | object | **[DEPRECATED]** See the [AlbertDependency section](#albertdependency) for more information. For details of configuration, see the [AlbertDependency section](#albertdependency). | `None` | | | -| celery | object | **[DEPRECATED]** See the [CeleryDependency section](#celerydependency) for more information. For details of configuration, see the [CeleryDependency section](#celerydependency). | `None` | | | -| elasticsearch | object | See the [ElasticsearchDependency section](#elasticsearchdependency) for more information. For details of configuration, see the [ElasticsearchDependency section](#elasticsearchdependency). | `None` | | | -| marker | object | **[DEPRECATED]** See the [MarkerDependency section](#markerdependency) for more information. For details of configuration, see the [MarkerDependency section](#markerdependency). | `None` | | | -| postgres | object | See the [PostgresDependency section](#postgresdependency) for more information. For details of configuration, see the [PostgresDependency section](#postgresdependency). | **required** | | | -| redis | object | See the [RedisDependency section](#redisdependency) for more information. For details of configuration, see the [RedisDependency section](#redisdependency). | **required** | | | -| sentry | object | See the [SentryDependency section](#sentrydependency) for more information. For details of configuration, see the [SentryDependency section](#sentrydependency). | `None` | | | - -

- -#### SentryDependency -Sentry is an optional dependency of OpenGateLLM. Sentry helps you identify, diagnose, and fix errors in real-time. -In this section, you can pass all sentry python SDK arguments, see https://docs.sentry.io/platforms/python/configuration/options/ for more information. -

- - -

- -#### RedisDependency -Redis is a required dependency of OpenGateLLM. Redis is used to store rate limiting counters and performance metrics. -Pass all `from_url()` method arguments of `redis.asyncio.connection.ConnectionPool` class, see https://redis.readthedocs.io/en/stable/connections.html#redis.asyncio.connection.ConnectionPool.from_url for more information. -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| url | string | Redis connection url. | **required** | | `redis://:changeme@localhost:6379` | - -

- -#### PostgresDependency -Postgres is a required dependency of OpenGateLLM. In this section, you can pass all postgres python SDK arguments, see https://github.com/etalab-ia/opengatellm/blob/main/docs/dependencies/postgres.md for more information. -Only the `url` argument is required. The connection URL must use the asynchronous scheme, `postgresql+asyncpg://`. If you provide a standard `postgresql://` URL, it will be automatically converted to use asyncpg. -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| url | string | PostgreSQL connection url. | **required** | | `postgresql+asyncpg://postgres:changeme@localhost:5432/postgres` | - -

- -#### MarkerDependency -**[DEPRECATED]** -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| headers | object | Marker API request headers. | `{}` | | ``{'Authorization': 'Bearer my-api-key'}`` | -| timeout | integer | Timeout for the Marker API requests. | `300` | | `10` | -| url | string | Marker API url. | **required** | | | - -

- -#### ElasticsearchDependency -Elasticsearch is an optional dependency of OpenGateLLM. Elasticsearch is used as a vector store. If this dependency is provided, all documents endpoint are enabled. -Pass all arguments of `elasticsearch.Elasticsearch` class, see https://elasticsearch-py.readthedocs.io/en/latest/api/elasticsearch.html for more information. -Other arguments declared below are used to configure the Elasticsearch index. -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| index_language | string | Language of the Elasticsearch index. | `english` | • `english`

• `french`

• `german`

• `italian`

• `portuguese`

• `spanish`

• `swedish` | `english` | -| index_name | string | Name of the Elasticsearch index. | `opengatellm` | | `my_index` | -| number_of_replicas | integer | Number of replicas for the Elasticsearch index. | `1` | | `1` | -| number_of_shards | integer | Number of shards for the Elasticsearch index. | `24` | | `1` | - -

- -#### CeleryDependency -**[DEPRECATED]** -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| broker_url | string | Celery broker url like Redis (redis://) or RabbitMQ (amqp://). If not provided, use redis dependency as broker. | `None` | | | -| enable_utc | boolean | Enable UTC. | `True` | | `True` | -| result_backend | string | Celery result backend url. If not provided, use redis dependency as result backend. | `None` | | | -| timezone | string | Timezone. | `UTC` | | `UTC` | - -

- -#### AlbertDependency -**[DEPRECATED]** -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| headers | object | Albert API request headers. | `{}` | | ``{'Authorization': 'Bearer my-api-key'}`` | -| timeout | integer | Timeout for the Albert API requests. | `300` | | `10` | -| url | string | Albert API url. | `https://albert.api.etalab.gouv.fr` | | | - -

- -## Playground configuration -The following parameters allow you to configure the Playground application. The configuration file can be shared with the API, as the sections are -identical and compatible. Some parameters are common to both the API and the Playground (for example, `app_title`). - -For Plagroud deployment, some environment variables are required to be set, like Reflex backend URL. See -[Environment variables](/configuration/environment_variable/#playground) for more information. -

- -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| dependencies | object | Dependencies used by the playground. For details of configuration, see the [Dependencies section](#dependencies). | **required** | | | -| settings | object | General settings configuration fields. Some fields are common to the API and the playground. For details of configuration, see the [Settings section](#settings). | **required** | | | - -

- -### Settings -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| app_title | string | The title of the application. | `OpenGateLLM` | | | -| auth_key_max_expiration_days | integer | Maximum number of days for a token to be valid. | `None` | | | -| documentation_url | string | Documentation URL. If not provided, deactivated documentation link in the navigation bar. | `https://docs.opengatellm.org` | | | -| playground_default_model | string | The first model selected in chat page. | `None` | | | -| playground_opengatellm_timeout | integer | The timeout in seconds for the OpenGateLLM API. | `60` | | | -| playground_opengatellm_url | string | The URL of the OpenGateLLM API. | `http://localhost:8000` | | | -| playground_theme_accent_color | string | The primary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors. | `purple` | | | -| playground_theme_appearance | string | The appearance of the theme. | `light` | | | -| playground_theme_gray_color | string | The secondary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors. | `gray` | | | -| playground_theme_has_background | boolean | Whether the theme has a background. | `True` | | | -| playground_theme_panel_background | string | Whether panel backgrounds are translucent: 'solid' \| 'translucent'. | `solid` | | | -| playground_theme_radius | string | The radius of the theme. Can be 'small', 'medium', or 'large'. | `medium` | | | -| playground_theme_scaling | string | The scaling of the theme. | `100%` | | | -| reference_url | string | Reference URL. If not provided, deactivated reference link in the navigation bar. | `http://localhost:8000/redoc` | | | -| routing_max_priority | integer | Maximum allowed priority in routing tasks. | `10` | | | -| swagger_url | string | Swagger URL. If not provided, deactivated swagger link in the navigation bar. | `http://localhost:8000/docs` | | | - -

- -### Dependencies -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| redis | object | Set the Redis connection url to use as stage manager. See https://reflex.dev/docs/api-reference/config/ for more information. For details of configuration, see the [RedisDependency section](#redisdependency). | `None` | | | - -

- -#### RedisDependency -| Attribute | Type | Description | Default | Values | Examples | -| --- | --- | --- | --- | --- | --- | -| url | string | Redis connection url. | **required** | | `redis://:changeme@localhost:6379` | - -

- diff --git a/docs/src/content/docs/configuration/configuration_file.mdx b/docs/src/content/docs/configuration/configuration_file.mdx new file mode 100644 index 000000000..baca95fb2 --- /dev/null +++ b/docs/src/content/docs/configuration/configuration_file.mdx @@ -0,0 +1,454 @@ +--- +title: Configuration file +sidebar: + label: "[lucide:file-text] Configuration file" + order: 0 +--- +import { Tabs, TabItem } from '@astrojs/starlight/components'; + +OpenGateLLM requires configuring a configuration file. This defines models, dependencies, and settings parameters. Playground and API need a configuration file (could be the same file), see [API configuration](#api-configuration) and [Playground configuration](#playground-configuration). + +By default, the configuration file must be `./config.yml` file. + +You can change the configuration file by setting the `CONFIG_FILE` environment variable. + +## Secrets + +You can pass environment variables in configuration file with pattern `${ENV_VARIABLE_NAME}`. All environment variables will be loaded in the configuration file. + +**Example** + +```yaml +models: + [...] + - name: my-language-model + type: text-generation + providers: + - type: openai + url: https://api.openai.com + key: ${OPENAI_API_KEY} + model_name: gpt-4o-mini +``` + +## Example + +The following is an example of configuration file: + +```yaml +# ----------------------------------- models ------------------------------------ +models: + - name: albert-testbed + type: text-generation + # aliases: ["model-alias"] + # owned_by: Me + # load_balancing_strategy: shuffle + # cost_prompt_tokens: 0.10 + # cost_completion_tokens: 0.10 + providers: + - type: vllm + url: http://albert-testbed.etalab.gouv.fr:8000 + # key: sk-xxx + model_name: "gemma3:1b" + # timeout: 60 + # model_hosting_zone: FRA + # model_total_params: 8 + # model_active_params: 8 + +# -------------------------------- dependencies --------------------------------- +dependencies: + postgres: # required + url: postgresql+asyncpg://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-localhost}:${POSTGRES_PORT:-5432}/postgres + echo: False + pool_size: 5 + connect_args: + server_settings: + statement_timeout: "120s" + command_timeout: 60 + + redis: # required + url: redis://:${REDIS_PASSWORD:-changeme}@${REDIS_HOST:-localhost}:${REDIS_PORT:-6379} + max_connections: 200 + socket_connect_timeout: 5 + retry_on_timeout: True + health_check_interval: 30 + decode_responses: False + socket_keepalive: True + + elasticsearch: # optional + index_name: opengatellm + index_language: english + number_of_shards: 1 + number_of_replicas: 0 + hosts: "http://${ELASTICSEARCH_HOST:-localhost}:${ELASTICSEARCH_PORT:-9200}" + basic_auth: + - "elastic" + - ${ELASTICSEARCH_PASSWORD} + + # sentry: + # dsn: ${SENTRY_DSN} + +# ---------------------------------- settings ----------------------------------- +settings: + # disabled_routers: ["admin", "audio"] + # hidden_routers: ["auth"] + # usage_tokenizer: tiktoken_gpt2 + # app_title: My OpenGateLLM API + + # log_level: INFO + # log_format: [%(asctime)s][%(process)d:%(name)s][%(levelname)s] %(client_ip)s - %(message)s + + swagger_version: 0.4.2 + # swagger_contact_url: https://github.com/etalab-ia/OpenGateLLM + # swagger_contact_email: john.doe@example.com + # swagger_docs_url: /docs + # swagger_redoc_url: /redoc + + auth_master_key: changeme # DEPRECATED, use auth_secret_key instead + auth_secret_key: changeme + + auth_default_username: admin + auth_default_password: changeme + + # rate_limiting_strategy: fixed_window + + # monitoring_sentry_enabled: True + # monitoring_postgres_enabled: True + # monitoring_prometheus_enabled: True + + # vector_store_model: my-model + + # search_multi_agents_synthesis_model: my-model + # search_multi_agents_reranker_model: my-model + + playground_opengatellm_url: ${OPENGATELLM_URL} + # playground_sso_enabled: False + # playground_sso_opengatellm_admin_api_key: ${SSO_OPENGATELLM_ADMIN_API_KEY} + # playground_sso_opengatellm_default_role_id: 1 + # playground_default_model: my-model + # playground_theme_has_background: True + # playground_theme_accent_color: purple + # playground_theme_appearance: dark + # playground_theme_gray_color: gray + # playground_theme_panel_background: solid + # playground_theme_radius: medium + # playground_theme_scaling: 100% + +``` + +## API configuration + +Configuration file is composed of 3 sections, models: +- `models`: to declare models API exposed to the API. +- `dependencies`: to declare both required plugins for the API (e.g. PostgreSQL, Redis) and optional ones (e.g. Elasticsearch). +- `settings`: to configure the API. + +:::warnings +We don't recommend to use the configuration file to declare models, prefer to use the API to declare models, by endpoints or on the Playground UI (see [Models configuration](/getting-started/models/)). +::: + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:-------------|:-------|:-----------------------------------------------------------------------------------------------------------|:-------------|:---------|:-----------| +| models | array | Models used by the API. For details of configuration, see the [Model section](#model). | **required** | | | +| dependencies | | Dependencies used by the API. For details of configuration, see the [Dependencies section](#dependencies). | **required** | | | +| settings | | For details of configuration, see the [Settings section](#settings). | **required** | | | + +

+ + + + +### Model + +In the models section, you define a list of models. Each model is a set of API providers for that model. Users will access the models specified in +this section using their *name*. Load balancing is performed between the different providers of the requested model. All providers in a model must +serve the same type of model (text-generation or text-embeddings-inference, etc.). We recommend that all providers of a model serve exactly the same +model, otherwise users may receive responses of varying quality. For embedding models, the API verifies that all providers output vectors of the +same dimension. You can define the load balancing strategy between the model's providers. By default, it is random. + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:------------------------|:-------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------| +| name | string | Unique name exposed to clients when selecting the model. | **required** | | gpt-4o | +| type | string | Type of the model. It will be used to identify the model type. | **required** | • image-to-text

• automatic-speech-recognition

• text-embeddings-inference

• text-classification

• text-generation

• image-text-to-text | text-generation | +| aliases | array | Aliases of the model. It will be used to identify the model by users. | [] | | ['model-alias', 'model-alias-2'] | +| load_balancing_strategy | string | Routing strategy for load balancing between providers of the model. | shuffle | • least_busy

• shuffle | least_busy | +| cost_prompt_tokens | number | Model costs prompt tokens for user budget computation. The cost is by 1M tokens. | 0.0 | | 0.1 | +| cost_completion_tokens | number | Model costs completion tokens for user budget computation. The cost is by 1M tokens. Set to `0.0` to disable budget computation for this model. | 0.0 | | 0.1 | +| providers | array | API providers of the model. If there are multiple providers, the model will be load balanced between them according to the routing strategy. The different models have to the same type. For details of configuration, see the [ModelProvider section](#modelprovider). | **required** | | | + +

+ +#### ModelProvider + + + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:--------------------|:-------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------|:----------------------------------------------------------------------------------------------------------------------|:-----------------------| +| type | string | Model provider type. | **required** | • openai

• tei

• mistral

• albert

• vllm | openai | +| url | null, string | Model provider API url. The url must only contain the domain name (without `/v1` suffix for example). Depends of the model provider type, the url can be optional (Albert, OpenAI). | None | | https://api.openai.com | +| key | null, string | Model provider API key. | None | | sk-1234567890 | +| timeout | integer | Timeout for the model provider requests, after user receive an 500 error (model is too busy). | 300 | | 10 | +| model_name | string | Model name from the model provider. | **required** | | gpt-4o | +| model_hosting_zone | string | Model hosting zone using ISO 3166-1 alpha-3 code format (e.g., `WOR` for World, `FRA` for France, `USA` for United States). This determines the electricity mix used for carbon intensity calculations. For more information, see https://ecologits.ai | WOR | • JEY

• UMI

• ZWE

• NAM

• PER

• PRI

• GRD

• AUT

• ... | WOR | +| model_total_params | integer | Total params of the model in billions of parameters for carbon footprint computation. For more information, see https://ecologits.ai | 0 | | 8 | +| model_active_params | integer | Active params of the model in billions of parameters for carbon footprint computation. For more information, see https://ecologits.ai | 0 | | 8 | +| qos_metric | null, string | The metric to use for the quality of service. If not provided, no QoS policy is applied. | None | • inflight

• ttft

• performance

• latency | inflight | +| qos_limit | null, number | The value to use for the quality of service. Depends of the metric, the value can be a percentile, a threshold, etc. | None | | 0.5 | + +

+ + + + +### Dependencies + + + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:--------------|:-------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------|:---------|:-----------| +| elasticsearch | null | Elasticsearch is an optional dependency of OpenGateLLM. Elasticsearch is used as a vector store. If this dependency is provided, all documents endpoint are enabled. For details of configuration, see the [ElasticsearchDependency section](#elasticsearchdependency). | None | | | +| postgres | | Postgres is a required dependency of OpenGateLLM to store API data. For details of configuration, see the [PostgresDependency section](#postgresdependency). | **required** | | | +| redis | | Redis is a required dependency of OpenGateLLM to store rate limiting counters and performance metrics. For details of configuration, see the [RedisDependency section](#redisdependency). | **required** | | | +| sentry | null | Sentry is an optional dependency of OpenGateLLM. Sentry helps you identify, diagnose, and fix errors in real-time. For details of configuration, see the [SentryDependency section](#sentrydependency). | None | | | + +

+ + + + +#### ElasticsearchDependency + +Elasticsearch is an optional dependency of OpenGateLLM. Elasticsearch is used as a vector store. If this dependency is provided, all documents endpoint are enabled. +Pass all arguments of `elasticsearch.Elasticsearch` class, see https://elasticsearch-py.readthedocs.io/en/latest/api/elasticsearch.html for more information. +Other arguments declared below are used to configure the Elasticsearch index. + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:-------------------|:--------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------|:-----------------------------------------------------------------------------------------------------------------------|:-----------| +| index_name | string | Name of the Elasticsearch index. | opengatellm | | my_index | +| index_language | string | The language of the Elasticsearch index, composed by the value, the stopwords and the stemmer. | english | • spanish

• french

• german

• swedish

• english

• portuguese

• italian | english | +| | | For more information about stemmer, see https://www.elastic.co/docs/reference/text-analysis/analysis-stemmer-tokenfilter#analysis-stemmer-tokenfilter-configure-parms. | | | | +| number_of_shards | integer | Number of shards for the Elasticsearch index. | 24 | | 1 | +| number_of_replicas | integer | Number of replicas for the Elasticsearch index. | 1 | | 1 | + +

+ + + + +#### PostgresDependency + +Postgres is a required dependency of OpenGateLLM. In this section, you can pass all postgres python SDK arguments, see https://github.com/etalab-ia/opengatellm/blob/main/docs/dependencies/postgres.md for more information. +Only the `url` argument is required. The connection URL must use the asynchronous scheme, `postgresql+asyncpg://`. If you provide a standard `postgresql://` URL, it will be automatically converted to use asyncpg. + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:------------|:-------|:---------------------------|:-------------|:---------|:---------------------------------------------------------------| +| url | string | PostgreSQL connection url. | **required** | | postgresql+asyncpg://postgres:changeme@localhost:5432/postgres | + +

+ + + + +#### RedisDependency + +Redis is a required dependency of OpenGateLLM. Redis is used to store rate limiting counters and performance metrics. +Pass all `from_url()` method arguments of `redis.asyncio.connection.ConnectionPool` class, see https://redis.readthedocs.io/en/stable/connections.html#redis.asyncio.connection.ConnectionPool.from_url for more information. + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:------------|:-------|:----------------------|:-------------|:---------|:---------------------------------| +| url | string | Redis connection url. | **required** | | redis://:changeme@localhost:6379 | + +

+ + + + +#### SentryDependency + +Sentry is an optional dependency of OpenGateLLM. Sentry helps you identify, diagnose, and fix errors in real-time. +In this section, you can pass all sentry python SDK arguments, see https://docs.sentry.io/platforms/python/configuration/options/ for more information. + +

+ +**No settings.** + +

+ + + + + + + +### Settings + +General settings configuration fields. + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:---------------------------------|:--------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------| +| disabled_routers | array | Disabled routers to limits services of the API. | [] | • auth

• collections

• chunks

• monitoring

• parse

• embeddings

• me

• audio

• ... | ['embeddings'] | +| hidden_routers | array | Routers are enabled but hidden in the swagger and the documentation of the API. | [] | • auth

• collections

• chunks

• monitoring

• parse

• embeddings

• me

• audio

• ... | ['admin'] | +| app_title | string | Display title of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | OpenGateLLM | | My API | +| routing_max_retries | integer | Maximum number of retries for routing tasks. | 3 | | | +| routing_retry_countdown | integer | Number of seconds before retrying a failed routing task. | 3 | | | +| routing_max_priority | integer | Maximum allowed priority in routing tasks. | 4 | | | +| usage_tokenizer | string | Tokenizer used to compute usage of the API. | tiktoken_gpt2 | • tiktoken_r50k_base

• tiktoken_gpt2

• tiktoken_cl100k_base

• tiktoken_p50k_base

• tiktoken_p50k_edit

• tiktoken_o200k_base | | +| log_level | string | Logging level of the API. | INFO | • ERROR

• DEBUG

• WARNING

• CRITICAL

• INFO | | +| log_format | string | Logging format of the API. | [%(asctime)s][%(process)d:%(name)s][%(levelname)s] %(client_ip)s - %(message)s | | | +| swagger_summary | string | Display summary of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | OpenGateLLM connect to your models. You can configuration this swagger UI in the configuration file, like hide routes or change the title. | | My API description. | +| swagger_version | string | Display version of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | latest | | 2.5.0 | +| swagger_description | string | Display description of your API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | [See documentation](https://github.com/etalab-ia/opengatellm/blob/main/README.md) | | [See documentation](https://github.com/etalab-ia/opengatellm/blob/main/README.md) | +| swagger_contact | null, object | Contact informations of the API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | None | | | +| swagger_license_info | object | Licence informations of the API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | \{'name': 'MIT Licence', 'identifier': 'MIT', 'url': 'https://raw.githubusercontent.com/etalab-ia/opengatellm/refs/heads/main/LICENSE'\} | | | +| swagger_terms_of_service | null, string | A URL to the Terms of Service for the API in swagger UI. If provided, this has to be a URL. | None | | https://example.com/terms-of-service | +| swagger_openapi_tags | array | OpenAPI tags of the API in swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | [] | | | +| swagger_openapi_url | string | OpenAPI URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | /openapi.json | | | +| swagger_docs_url | string | Docs URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | /docs | | | +| swagger_redoc_url | string | Redoc URL of swagger UI, see https://fastapi.tiangolo.com/tutorial/metadata for more information. | /redoc | | | +| auth_secret_key | null, string | Secret key for the API. It should be a random string with at least 32 characters. This key is used to encrypt user tokens, watch out if you modify the secret key, you'll need to update all user API keys. If not provided, the master key will be used. | None | | | +| auth_default_username | string | Username of the admin user created at startup. | admin | | | +| auth_default_password | string | Password of the admin user created at startup. | changeme | | | +| auth_key_max_expiration_days | null, integer | Maximum number of days for a new API key to be valid. | None | | | +| auth_playground_session_duration | integer | Duration of the playground postgres_session in seconds. | 3600 | | | +| rate_limiting_strategy | string | Rate limiting strategy for the API. | fixed_window | • fixed_window

• moving_window

• sliding_window | | +| monitoring_postgres_enabled | boolean | If true, the log usage will be written in the PostgreSQL database. | True | | | +| monitoring_prometheus_enabled | boolean | If true, Prometheus metrics will be exposed in the `/metrics` endpoint. | True | | | +| vector_store_model | null, string | Model used to vectorize the text in the vector store database. Is required if a vector store dependency is provided (Elasticsearch). This model must be defined in the `models` section and have type `text-embeddings-inference`. | None | | | +| document_parsing_max_concurrent | integer | Maximum number of concurrent document parsing tasks per worker. | 10 | | | +| front_url | string | Front-end URL for the application. | http://localhost:8501 | | | + +

+ + + + +## Playground configuration + +The following parameters allow you to configure the Playground application. The configuration file can be shared with the API, as the sections are +identical and compatible. Some parameters are common to both the API and the Playground (for example, `app_title`). + +For Plagroud deployment, some environment variables are required to be set, like Reflex backend URL. See +[Environment variables](/configuration/environment_variable/#playground) for more information. + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:-------------|:-------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------|:---------|:-----------| +| dependencies | | Dependencies used by the playground. For details of configuration, see the [Dependencies section](#dependencies). | **required** | | | +| settings | | General settings configuration fields. Some fields are common to the API and the playground. For details of configuration, see the [SettingsWithoutSSO section](#settingswithoutsso). For details of configuration, see the [SettingsWithSSO section](#settingswithsso). | **required** | | | + +

+ + + + +### Dependencies + + + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:------------|:-------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----------|:---------|:-----------| +| redis | null | Set the Redis connection url to use as stage manager. See https://reflex.dev/docs/api-reference/config/ for more information. For details of configuration, see the [RedisDependency section](#redisdependency). | None | | | + +

+ +#### RedisDependency + + + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:------------|:-------|:----------------------|:-------------|:---------|:---------------------------------| +| url | string | Redis connection url. | **required** | | redis://:changeme@localhost:6379 | + +

+ + + + +### SettingsWithoutSSO + + + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:-------------------------------------------|:--------------|:-------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------|:---------|:-----------| +| auth_key_max_expiration_days | null, integer | Maximum number of days for a token to be valid. | None | | | +| routing_max_priority | integer | Maximum allowed priority in routing tasks. | 10 | | | +| app_title | string | The title of the application. | OpenGateLLM | | | +| playground_opengatellm_url | string | The URL of the OpenGateLLM API. | http://localhost:8000 | | | +| playground_opengatellm_timeout | integer | The timeout in seconds for the OpenGateLLM API. | 60 | | | +| playground_default_model | null, string | The first model selected in chat page. | None | | | +| playground_theme_has_background | boolean | Whether the theme has a background. | True | | | +| playground_theme_accent_color | string | The primary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors. | purple | | | +| playground_theme_appearance | string | The appearance of the theme. | light | | | +| playground_theme_gray_color | string | The secondary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors. | gray | | | +| playground_theme_panel_background | string | Whether panel backgrounds are translucent: 'solid' \| 'translucent'. | solid | | | +| playground_theme_radius | string | The radius of the theme. Can be 'small', 'medium', or 'large'. | medium | | | +| playground_theme_scaling | string | The scaling of the theme. | 100% | | | +| swagger_url | null, string | Swagger URL. If not provided, deactivated swagger link in the navigation bar. | http://localhost:8000/docs | | | +| reference_url | null, string | Reference URL. If not provided, deactivated reference link in the navigation bar. | http://localhost:8000/redoc | | | +| documentation_url | null, string | Documentation URL. If not provided, deactivated documentation link in the navigation bar. | https://docs.opengatellm.org | | | +| playground_sso_enabled | boolean | Whether SSO is enabled. | False | | | +| playground_sso_opengatellm_admin_api_key | | To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens. | None | | | +| playground_sso_opengatellm_default_role_id | | To activate SSO, set the default role ID of OpenGateLLM API for new users. | None | | | +| playground_sso_provider_logout_url | | The logout url for SSO. | None | | | + +

+ + + + +### SettingsWithSSO + + + +

+ +| Attribute | Type | Description | Default | Values | Examples | +|:-------------------------------------------|:--------------|:-------------------------------------------------------------------------------------------------------------------------------------|:-----------------------------|:---------|:-----------| +| auth_key_max_expiration_days | null, integer | Maximum number of days for a token to be valid. | None | | | +| routing_max_priority | integer | Maximum allowed priority in routing tasks. | 10 | | | +| app_title | string | The title of the application. | OpenGateLLM | | | +| playground_opengatellm_url | string | The URL of the OpenGateLLM API. | http://localhost:8000 | | | +| playground_opengatellm_timeout | integer | The timeout in seconds for the OpenGateLLM API. | 60 | | | +| playground_default_model | null, string | The first model selected in chat page. | None | | | +| playground_theme_has_background | boolean | Whether the theme has a background. | True | | | +| playground_theme_accent_color | string | The primary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors. | purple | | | +| playground_theme_appearance | string | The appearance of the theme. | light | | | +| playground_theme_gray_color | string | The secondary color used for default buttons, typography, backgrounds, etc. See available colors at https://www.radix-ui.com/colors. | gray | | | +| playground_theme_panel_background | string | Whether panel backgrounds are translucent: 'solid' \| 'translucent'. | solid | | | +| playground_theme_radius | string | The radius of the theme. Can be 'small', 'medium', or 'large'. | medium | | | +| playground_theme_scaling | string | The scaling of the theme. | 100% | | | +| swagger_url | null, string | Swagger URL. If not provided, deactivated swagger link in the navigation bar. | http://localhost:8000/docs | | | +| reference_url | null, string | Reference URL. If not provided, deactivated reference link in the navigation bar. | http://localhost:8000/redoc | | | +| documentation_url | null, string | Documentation URL. If not provided, deactivated documentation link in the navigation bar. | https://docs.opengatellm.org | | | +| playground_sso_enabled | boolean | Whether SSO is enabled. | True | | | +| playground_sso_opengatellm_admin_api_key | string | To activate SSO, set OpenGateLLM API key with ADMIN permissions to create users and tokens. | **required** | | | +| playground_sso_opengatellm_default_role_id | integer | To activate SSO, set the default role ID of OpenGateLLM API for new users. | **required** | | | +| playground_sso_provider_logout_url | string | The logout url for SSO. | **required** | | | + +

+ + + + diff --git a/scripts/docs/configuration_header.md b/scripts/docs/configuration_header.md index dc04a2d76..b5cdbdf24 100644 --- a/scripts/docs/configuration_header.md +++ b/scripts/docs/configuration_header.md @@ -4,7 +4,7 @@ sidebar: label: "[lucide:file-text] Configuration file" order: 0 --- -import { Tabs } from '@astrojs/starlight/components'; +import { Tabs, TabItem } from '@astrojs/starlight/components'; OpenGateLLM requires configuring a configuration file. This defines models, dependencies, and settings parameters. Playground and API need a configuration file (could be the same file), see [API configuration](#api-configuration) and [Playground configuration](#playground-configuration). diff --git a/scripts/docs/generate_configuration_documentation.py b/scripts/docs/generate_configuration_documentation.py index fa2c6e41d..a77ebfc40 100644 --- a/scripts/docs/generate_configuration_documentation.py +++ b/scripts/docs/generate_configuration_documentation.py @@ -2,6 +2,9 @@ import os import sys +from pydantic import BaseModel, Field +from tabulate import tabulate + PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.path.insert(0, PROJECT_ROOT) sys.path.insert(0, os.path.join(PROJECT_ROOT, "playground")) @@ -11,142 +14,245 @@ from app.core.configuration import ConfigFile as PlaygroundConfigFile # noqa: E402 # type: ignore parser = argparse.ArgumentParser() -parser.add_argument("--output", type=str, default=os.path.join("./docs/src/content/docs/configuration/configuration_file.md")) - - -def convert_field_to_string_if_dict(field): - if isinstance(field, dict): - return "`" + str(field) + "`" - return field - - -def get_documentation_data(title: str, data: list, properties: dict, defs: dict, header: str = "", level: int = 1): - # attribute, type, description, required, default, values, examples - table = list() - for property in sorted(properties): - description = properties[property].get("description", "") - description = description.replace("|", "\\|") - - default = properties[property].get("default", properties[property].get("default", "**required**")) - default = f"`{default}`" if default != "**required**" else "**required**" - - examples = convert_field_to_string_if_dict(properties[property].get("examples", [""])[0]) - examples = f"`{examples}`" if examples != "" else "" - - if "anyOf" in properties[property]: - properties[property].update(properties[property]["anyOf"][0]) - - if "oneOf" in properties[property]: - for one_of in properties[property]["oneOf"]: - ref_key = one_of.get("$ref").split("/")[-1] - ref = defs[ref_key] - type = ref.get("type", "") - values = ref.get("enum", []) - - if "properties" in ref: - data = get_documentation_data( - title=ref_key, - data=data, - properties=ref["properties"], - defs=defs, - header=ref.get("description"), - level=level + 1, - ) - - if "$ref" in properties[property]: - ref_key = properties[property]["$ref"].split("/")[-1] - ref = defs[ref_key] - type = ref.get("type", "") - values = ref.get("enum", []) - - # neested object section, get the data from the nested section - if "properties" in ref: - data = get_documentation_data( - title=ref_key, - data=data, - properties=ref["properties"], - defs=defs, - header=ref.get("description"), - level=level + 1, - ) - description += f" For details of configuration, see the [{ref_key} section](#{ref_key.lower().replace(' ', '-')})." +parser.add_argument("--output", type=str, default=os.path.join("./docs/src/content/docs/configuration/configuration_file.mdx")) - else: - type = properties[property].get("type", "") - values = properties[property].get("enum", []) - if type == "array" and "$ref" in properties[property]["items"]: - ref_key = properties[property]["items"]["$ref"].split("/")[-1] - ref = defs[ref_key] +class Row(BaseModel): + attribute: str + types: list[str] + description: str + default: str + values: list + examples: list - # neested array section, get the data from the nested section - if "properties" in ref: - data = get_documentation_data( - title=ref_key, - data=data, - properties=ref["properties"], - defs=defs, - header=ref.get("description"), - level=level + 1, - ) - description += f" For details of configuration, see the [{ref_key} section](#{ref_key.lower().replace(' ', '-')})." - else: - values = ref.get("enum", []) - values = [f"`{value}`" for value in values] - table.append([property, type, description, default, values, examples]) +class Table(BaseModel): + title: str + description: str + rows: list[Row] + tables: list["Table"] = Field(default_factory=list) # recursive field - data.append({"title": title, "table": table, "level": level, "header": header}) - return data +def get_description(property: dict, ref_keys: list[str]): + description = property.get("description", "") + for ref_key in ref_keys: + description += f" For details of configuration, see the [{ref_key} section](#{ref_key.lower().replace(' ', '-')})." + return description -def get_example_configuration(config_example: str): - data = f""" -## Example -The following is an example of configuration file: +def get_default(property: dict): + default = property.get("default", "required") + default = str(default) + return default -```yaml -{config_example} -``` -""" +def get_attribute(property: dict): + return property.get("title", "") + + +def get_types(property: dict): + type = property.get("type") + types = [] if type is None else [type] + if "anyOf" in property: + for any_of in property["anyOf"]: + if "type" in any_of: + types.append(any_of.get("type")) + + return list(set(types)) + + +def get_values(property: dict): + values = property.get("enum", []) + if "anyOf" in property: + for any_of in property["anyOf"]: + if "enum" in any_of: + values.extend(any_of.get("enum", [])) + + elif property.get("type") == "array": + values.extend(property.get("items", {}).get("enum", [])) + + elif "oneOf" in property: + for one_of in property["oneOf"]: + values.extend(one_of.get("enum", [])) + + return list(set(values)) - return data +def get_examples(property: dict): + return property.get("examples", []) -def convert_to_markdown(data: list): - markdown = "" - for item in reversed(data): - markdown += f"{'#' * (item['level'] + 1)} {item['title']}\n" - if item["header"]: - markdown += f"{item['header']}\n

\n\n" - if len(item["table"]) > 0: - markdown += "| Attribute | Type | Description | Default | Values | Examples |\n" - markdown += "| --- | --- | --- | --- | --- | --- |\n" - for row in item["table"]: - if len(row[4]) > 10: - row[4] = "• " + "

• ".join(row[4][:8]) + "

• ..." - elif len(row[4]) > 0: - row[4] = "• " + "

• ".join(row[4]) +def replace_enum_ref_by_enum_schema_and_extract_ref_keys(property: dict, enum_schemas: dict) -> tuple[dict, list[str]]: + def _extract_key(ref: str) -> str: + return ref.split("/")[-1] + + ref_keys = [] + if "$ref" in property: + if property["$ref"] in enum_schemas: + property.update(enum_schemas[property["$ref"]]) + property.pop("$ref") + else: + ref_key = _extract_key(ref=property["$ref"]) + ref_keys.append(ref_key) + + elif property.get("type") == "array" and "$ref" in property["items"]: + if property["items"]["$ref"] in enum_schemas: + property["items"] = enum_schemas[property["items"]["$ref"]] + else: + ref_key = _extract_key(ref=property["items"]["$ref"]) + ref_keys.append(ref_key) + + elif "anyOf" in property: + for i, any_of in enumerate(property["anyOf"]): + if "$ref" in any_of: + if any_of["$ref"] in enum_schemas: + property["anyOf"][i] = enum_schemas[any_of["$ref"]] + else: + ref_key = _extract_key(ref=any_of["$ref"]) + ref_keys.append(ref_key) + + elif "oneOf" in property: + for i, one_of in enumerate(property["oneOf"]): + if "$ref" in one_of: + if one_of["$ref"] in enum_schemas: + property["oneOf"][i] = enum_schemas[one_of["$ref"]] else: - row[4] = "" + ref_key = _extract_key(ref=one_of["$ref"]) + ref_keys.append(ref_key) + + return property, ref_keys + + +def build_row(attribute: str, property: dict, ref_keys: list[str]): + description = get_description(property=property, ref_keys=ref_keys) + default = get_default(property=property) + types = get_types(property=property) + values = get_values(property=property) + examples = get_examples(property=property) + row = Row(attribute=attribute, types=types, description=description, default=default, values=values, examples=examples) + + return row + + +def parse_schema(table: Table, properties: dict, defs: dict, enum_schemas: dict): + for attribute, property in properties.items(): + if property.get("deprecated", False): + continue + + property, ref_keys = replace_enum_ref_by_enum_schema_and_extract_ref_keys(property=property, enum_schemas=enum_schemas) + row = build_row(attribute=attribute, property=property, ref_keys=ref_keys) + table.rows.append(row) + + for ref_key in ref_keys: + if "properties" in defs[ref_key]: + sub_table = Table(title=defs[ref_key].get("title", ""), description=get_description(defs[ref_key], ref_keys=[]), rows=[], tables=[]) + sub_table = parse_schema(table=sub_table, properties=defs[ref_key]["properties"], defs=defs, enum_schemas=enum_schemas) + table.tables.append(sub_table) + + return table + + +def handle_acorn(text: str) -> str: + text = text.replace("{", "\\{") + text = text.replace("}", "\\}") + return text + - markdown += "| " + " | ".join(str(cell) for cell in row) + " |\n" +def format_examples(examples: list) -> str: + if len(examples) > 0: + example = str(examples[0]) + example = handle_acorn(text=example) + return example + else: + return "" - elif item["header"] == "": - markdown += "No settings." - markdown += "\n

\n\n" +def format_description(description: str): + description = handle_acorn(text=description) + return description.replace("|", "\\|") + + +def format_default(default: str) -> str: + default = handle_acorn(text=default) + default = default if default != "required" else "**required**" + return default + + +def format_values(values: list) -> str: + values = [handle_acorn(text=value) for value in values] + if len(values) > 10: + return "• " + "

• ".join(values[:8]) + "

• ..." + elif len(values) > 0: + return "• " + "

• ".join(values) + else: + return "" + + +def format_types(types: list) -> str: + types = [handle_acorn(text=type) for type in types] + return ", ".join(types) + + +def format_row(row: Row): + row = row.model_dump() + row["description"] = format_description(row["description"]) + row["default"] = format_default(row["default"]) + row["values"] = format_values(row["values"]) + row["examples"] = format_examples(row["examples"]) + row["types"] = format_types(row["types"]) + row = [value for key, value in row.items()] + + return row + + +def convert_to_markdown(table: Table, markdown: str = "", level: int = 1): + breakline_small = "\n\n" + breakline_large = "\n\n

\n\n" + level += 1 + markdown += f"{'#' * level} {table.title}{breakline_small}" + markdown += f"{table.description}{breakline_large}" + + if len(table.rows) == 0: + markdown += f"**No settings.**{breakline_large}" + return markdown + + md_table = tabulate( + tabular_data=[format_row(row) for row in table.rows], + headers=["Attribute", "Type", "Description", "Default", "Values", "Examples"], + tablefmt="pipe", + ) + markdown += f"{md_table}{breakline_large}" + + if table.tables: + markdown += "\n" if len(table.tables) > 1 else "" + for sub_table in table.tables: + markdown += f'\n\n' if len(table.tables) > 1 else "" + markdown = convert_to_markdown(table=sub_table, markdown=markdown, level=level) + markdown += "\n" if len(table.tables) > 1 else "" + markdown += f"{breakline_small}" if len(table.tables) > 1 else "" + + return markdown + + +def get_example_configuration(config_example: str): + markdown = f""" +## Example + +The following is an example of configuration file: + +```yaml +{config_example} +``` + +""" return markdown if __name__ == "__main__": args = parser.parse_args() - assert args.output.endswith(".md"), f"Output file must end with .md ({args.output})" + assert args.output.endswith(".mdx"), f"Output file must end with .md ({args.output})" assert os.path.exists(os.path.dirname(args.output)), f"Output directory does not exist ({os.path.dirname(args.output)})" with open(file=os.path.join("./scripts/docs/configuration_header.md")) as f: @@ -157,27 +263,22 @@ def convert_to_markdown(data: list): with open(file=os.path.join("config.example.yml")) as f: config_example = f.read() f.close() + markdown += get_example_configuration(config_example=config_example) schema = ApiConfigFile.model_json_schema() - api_data = get_documentation_data( - title="API configuration", - data=[], - properties=schema["properties"], - header=schema.get("description", ""), - defs=schema["$defs"], - ) - markdown += convert_to_markdown(data=api_data) + table = Table(title="API configuration", description=schema.get("description", ""), rows=[], tables=[]) + enum_schemas = {f"#/$defs/{attribute}": schema["$defs"][attribute] for attribute in schema["$defs"] if "enum" in schema["$defs"][attribute]} + + table = parse_schema(table=table, properties=schema["properties"], defs=schema["$defs"], enum_schemas=enum_schemas) + markdown += convert_to_markdown(table=table) schema = PlaygroundConfigFile.model_json_schema() - playground_data = get_documentation_data( - title="Playground configuration", - data=[], - properties=schema["properties"], - header=schema.get("description", ""), - defs=schema["$defs"], - ) - markdown += convert_to_markdown(data=playground_data) + table = Table(title="Playground configuration", description=schema.get("description", ""), rows=[], tables=[]) + enum_schemas = {f"#/$defs/{attribute}": schema["$defs"][attribute] for attribute in schema["$defs"] if "enum" in schema["$defs"][attribute]} + + table = parse_schema(table=table, properties=schema["properties"], defs=schema["$defs"], enum_schemas=enum_schemas) + markdown += convert_to_markdown(table=table) with open(file=args.output, mode="w") as f: f.write(markdown)