Merge branch 'main' into docs-core-components-agents
This commit is contained in:
commit
4c6c6fdbc2
4 changed files with 34 additions and 17 deletions
41
.github/workflows/build-multiarch.yml
vendored
41
.github/workflows/build-multiarch.yml
vendored
|
|
@ -2,6 +2,12 @@ name: Build Multi-Architecture Docker Images
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
update_latest:
|
||||||
|
description: 'Update latest tags (production release)'
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -123,30 +129,41 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
VERSION=${{ steps.version.outputs.version }}
|
VERSION=${{ steps.version.outputs.version }}
|
||||||
|
|
||||||
|
# Create versioned tags
|
||||||
docker buildx imagetools create -t phact/openrag-backend:$VERSION \
|
docker buildx imagetools create -t phact/openrag-backend:$VERSION \
|
||||||
phact/openrag-backend:$VERSION-amd64 \
|
phact/openrag-backend:$VERSION-amd64 \
|
||||||
phact/openrag-backend:$VERSION-arm64
|
phact/openrag-backend:$VERSION-arm64
|
||||||
docker buildx imagetools create -t phact/openrag-backend:latest \
|
|
||||||
phact/openrag-backend:$VERSION-amd64 \
|
|
||||||
phact/openrag-backend:$VERSION-arm64
|
|
||||||
|
|
||||||
docker buildx imagetools create -t phact/openrag-frontend:$VERSION \
|
docker buildx imagetools create -t phact/openrag-frontend:$VERSION \
|
||||||
phact/openrag-frontend:$VERSION-amd64 \
|
phact/openrag-frontend:$VERSION-amd64 \
|
||||||
phact/openrag-frontend:$VERSION-arm64
|
phact/openrag-frontend:$VERSION-arm64
|
||||||
docker buildx imagetools create -t phact/openrag-frontend:latest \
|
|
||||||
phact/openrag-frontend:$VERSION-amd64 \
|
|
||||||
phact/openrag-frontend:$VERSION-arm64
|
|
||||||
|
|
||||||
docker buildx imagetools create -t phact/openrag-langflow:$VERSION \
|
docker buildx imagetools create -t phact/openrag-langflow:$VERSION \
|
||||||
phact/openrag-langflow:$VERSION-amd64 \
|
phact/openrag-langflow:$VERSION-amd64 \
|
||||||
phact/openrag-langflow:$VERSION-arm64
|
phact/openrag-langflow:$VERSION-arm64
|
||||||
docker buildx imagetools create -t phact/openrag-langflow:latest \
|
|
||||||
phact/openrag-langflow:$VERSION-amd64 \
|
|
||||||
phact/openrag-langflow:$VERSION-arm64
|
|
||||||
|
|
||||||
docker buildx imagetools create -t phact/openrag-opensearch:$VERSION \
|
docker buildx imagetools create -t phact/openrag-opensearch:$VERSION \
|
||||||
phact/openrag-opensearch:$VERSION-amd64 \
|
phact/openrag-opensearch:$VERSION-amd64 \
|
||||||
phact/openrag-opensearch:$VERSION-arm64
|
phact/openrag-opensearch:$VERSION-arm64
|
||||||
docker buildx imagetools create -t phact/openrag-opensearch:latest \
|
|
||||||
phact/openrag-opensearch:$VERSION-amd64 \
|
# Only update latest tags if version is numeric AND checkbox is checked
|
||||||
phact/openrag-opensearch:$VERSION-arm64
|
if [[ "$VERSION" =~ ^[0-9.-]+$ ]] && [[ "${{ github.event.inputs.update_latest }}" == "true" ]]; then
|
||||||
|
echo "Updating latest tags for production release: $VERSION"
|
||||||
|
docker buildx imagetools create -t phact/openrag-backend:latest \
|
||||||
|
phact/openrag-backend:$VERSION-amd64 \
|
||||||
|
phact/openrag-backend:$VERSION-arm64
|
||||||
|
|
||||||
|
docker buildx imagetools create -t phact/openrag-frontend:latest \
|
||||||
|
phact/openrag-frontend:$VERSION-amd64 \
|
||||||
|
phact/openrag-frontend:$VERSION-arm64
|
||||||
|
|
||||||
|
docker buildx imagetools create -t phact/openrag-langflow:latest \
|
||||||
|
phact/openrag-langflow:$VERSION-amd64 \
|
||||||
|
phact/openrag-langflow:$VERSION-arm64
|
||||||
|
|
||||||
|
docker buildx imagetools create -t phact/openrag-opensearch:latest \
|
||||||
|
phact/openrag-opensearch:$VERSION-amd64 \
|
||||||
|
phact/openrag-opensearch:$VERSION-arm64
|
||||||
|
else
|
||||||
|
echo "Skipping latest tags - version: $VERSION, update_latest: ${{ github.event.inputs.update_latest }}"
|
||||||
|
fi
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
import { useGetConversationsQuery } from "@/app/api/queries/useGetConversationsQuery";
|
import { useGetConversationsQuery, type ChatConversation } from "@/app/api/queries/useGetConversationsQuery";
|
||||||
import { KnowledgeFilterDropdown } from "@/components/knowledge-filter-dropdown";
|
import { KnowledgeFilterDropdown } from "@/components/knowledge-filter-dropdown";
|
||||||
import { ModeToggle } from "@/components/mode-toggle";
|
import { ModeToggle } from "@/components/mode-toggle";
|
||||||
import { Navigation } from "@/components/navigation";
|
import { Navigation } from "@/components/navigation";
|
||||||
|
|
@ -29,7 +29,7 @@ export function NavigationLayout({ children }: NavigationLayoutProps) {
|
||||||
const { data: conversations = [], isLoading: isConversationsLoading } =
|
const { data: conversations = [], isLoading: isConversationsLoading } =
|
||||||
useGetConversationsQuery(endpoint, refreshTrigger, {
|
useGetConversationsQuery(endpoint, refreshTrigger, {
|
||||||
enabled: isOnChatPage && (isAuthenticated || isNoAuthMode),
|
enabled: isOnChatPage && (isAuthenticated || isNoAuthMode),
|
||||||
});
|
}) as { data: ChatConversation[]; isLoading: boolean };
|
||||||
|
|
||||||
const handleNewConversation = () => {
|
const handleNewConversation = () => {
|
||||||
refreshConversations();
|
refreshConversations();
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
import { Bell, Loader2 } from "lucide-react";
|
import { Bell, Loader2 } from "lucide-react";
|
||||||
import { usePathname } from "next/navigation";
|
import { usePathname } from "next/navigation";
|
||||||
import { useGetConversationsQuery } from "@/app/api/queries/useGetConversationsQuery";
|
import { useGetConversationsQuery, type ChatConversation } from "@/app/api/queries/useGetConversationsQuery";
|
||||||
import { useGetSettingsQuery } from "@/app/api/queries/useGetSettingsQuery";
|
import { useGetSettingsQuery } from "@/app/api/queries/useGetSettingsQuery";
|
||||||
import { KnowledgeFilterPanel } from "@/components/knowledge-filter-panel";
|
import { KnowledgeFilterPanel } from "@/components/knowledge-filter-panel";
|
||||||
import Logo from "@/components/logo/logo";
|
import Logo from "@/components/logo/logo";
|
||||||
|
|
@ -37,7 +37,7 @@ export function LayoutWrapper({ children }: { children: React.ReactNode }) {
|
||||||
const { data: conversations = [], isLoading: isConversationsLoading } =
|
const { data: conversations = [], isLoading: isConversationsLoading } =
|
||||||
useGetConversationsQuery(endpoint, refreshTrigger, {
|
useGetConversationsQuery(endpoint, refreshTrigger, {
|
||||||
enabled: isOnChatPage && (isAuthenticated || isNoAuthMode),
|
enabled: isOnChatPage && (isAuthenticated || isNoAuthMode),
|
||||||
});
|
}) as { data: ChatConversation[]; isLoading: boolean };
|
||||||
|
|
||||||
const handleNewConversation = () => {
|
const handleNewConversation = () => {
|
||||||
refreshConversations();
|
refreshConversations();
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[project]
|
[project]
|
||||||
name = "openrag"
|
name = "openrag"
|
||||||
version = "0.1.13"
|
version = "0.1.14.dev1"
|
||||||
description = "Add your description here"
|
description = "Add your description here"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.13"
|
requires-python = ">=3.13"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue