-
}
+ validationSchema={Yup.object().shape({
+ base_url: Yup.string().required(
+ "Please enter the website URL to scrape e.g. https://docs.github.com/en/actions"
+ ),
+ })}
+ initialValues={{ base_url: "" }}
onSubmit={(success) => {
if (success) {
mutate("/api/admin/connectors/web/index-attempt");
@@ -87,22 +87,21 @@ export default function Web() {
data={
urlToLatestIndexAttempt.size > 0
? Array.from(urlToLatestIndexAttempt.values()).map(
- (indexAttempt) => ({
- ...indexAttempt,
- indexed_at:
- timeAgo(urlToLatestIndexSuccess.get(indexAttempt.url)) ||
- "-",
- docs_indexed: indexAttempt.docs_indexed || "-",
- url: (
-
- {indexAttempt.url}
-
- ),
- })
+ (indexAttempt) => {
+ const url = indexAttempt.connector_specific_config
+ .base_url as string;
+ return {
+ indexed_at:
+ timeAgo(urlToLatestIndexSuccess.get(url)) || "-",
+ docs_indexed: indexAttempt.docs_indexed || "-",
+ url: (
+
+ {url}
+
+ ),
+ status: indexAttempt.status,
+ };
+ }
)
: []
}
diff --git a/web/src/app/admin/layout.tsx b/web/src/app/admin/layout.tsx
index 24eaea3c5..064b9af31 100644
--- a/web/src/app/admin/layout.tsx
+++ b/web/src/app/admin/layout.tsx
@@ -1,6 +1,6 @@
import { Header } from "@/components/Header";
import { Sidebar } from "@/components/admin/connectors/Sidebar";
-import { GlobeIcon, SlackIcon } from "@/components/icons/icons";
+import { GithubIcon, GlobeIcon, SlackIcon } from "@/components/icons/icons";
import { getCurrentUserSS } from "@/lib/userSS";
import { redirect } from "next/navigation";
@@ -45,6 +45,15 @@ export default async function AdminLayout({
),
link: "/admin/connectors/web",
},
+ {
+ name: (
+
+ ),
+ link: "/admin/connectors/github",
+ },
],
},
]}
diff --git a/web/src/components/admin/connectors/Form.tsx b/web/src/components/admin/connectors/Form.tsx
new file mode 100644
index 000000000..2daba47a0
--- /dev/null
+++ b/web/src/components/admin/connectors/Form.tsx
@@ -0,0 +1,106 @@
+import React, { useState } from "react";
+import { Formik, Form, FormikHelpers } from "formik";
+import * as Yup from "yup";
+import { Popup } from "./Popup";
+
+type ValidSources = "web" | "github";
+
+const handleSubmit = async (
+ source: ValidSources,
+ values: Yup.AnyObject,
+ { setSubmitting }: FormikHelpers
,
+ setPopup: (
+ popup: { message: string; type: "success" | "error" } | null
+ ) => void
+): Promise => {
+ setSubmitting(true);
+ let isSuccess = false;
+ try {
+ const response = await fetch(
+ `/api/admin/connectors/${source}/index-attempt`,
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ connector_specific_config: values }),
+ }
+ );
+
+ if (response.ok) {
+ isSuccess = true;
+ setPopup({ message: "Success!", type: "success" });
+ } else {
+ const errorData = await response.json();
+ setPopup({ message: `Error: ${errorData.detail}`, type: "error" });
+ }
+ } catch (error) {
+ setPopup({ message: `Error: ${error}`, type: "error" });
+ } finally {
+ setSubmitting(false);
+ setTimeout(() => {
+ setPopup(null);
+ }, 3000);
+ return isSuccess;
+ }
+};
+
+interface IndexFormProps {
+ source: ValidSources;
+ formBody: JSX.Element | null;
+ validationSchema: Yup.ObjectSchema;
+ initialValues: YupObjectType;
+ onSubmit: (isSuccess: boolean) => void;
+ additionalNonFormValues?: Yup.AnyObject;
+}
+
+export function IndexForm({
+ source,
+ formBody,
+ validationSchema,
+ initialValues,
+ onSubmit,
+ additionalNonFormValues = {},
+}: IndexFormProps): JSX.Element {
+ const [popup, setPopup] = useState<{
+ message: string;
+ type: "success" | "error";
+ } | null>(null);
+
+ return (
+ <>
+ {popup && }
+ {
+ handleSubmit(
+ source,
+ { ...values, ...additionalNonFormValues },
+ formikHelpers as FormikHelpers,
+ setPopup
+ ).then((isSuccess) => onSubmit(isSuccess));
+ }}
+ >
+ {({ isSubmitting }) => (
+
+ )}
+
+
+ );
+}
diff --git a/web/src/components/admin/connectors/RecurringConnectorStatus.tsx b/web/src/components/admin/connectors/RecurringConnectorStatus.tsx
index 02acb0b62..30b34a852 100644
--- a/web/src/components/admin/connectors/RecurringConnectorStatus.tsx
+++ b/web/src/components/admin/connectors/RecurringConnectorStatus.tsx
@@ -1,4 +1,10 @@
+"use client";
+
+import { ListIndexingResponse } from "@/app/admin/connectors/interfaces";
+import { fetcher } from "@/lib/fetcher";
+import { timeAgo } from "@/lib/time";
import { CheckCircle, MinusCircle } from "@phosphor-icons/react";
+import useSWR from "swr";
export enum ConnectorStatus {
Running = "Running",
@@ -7,16 +13,39 @@ export enum ConnectorStatus {
interface ReccuringConnectorStatusProps {
status: ConnectorStatus;
+ source: string;
}
export const ReccuringConnectorStatus = ({
status,
+ source,
}: ReccuringConnectorStatusProps) => {
+ const { data } = useSWR(
+ `/api/admin/connectors/${source}/index-attempt`,
+ fetcher
+ );
+
+ const lastSuccessfulAttempt = data?.index_attempts
+ .filter((attempt) => attempt.status === "success")
+ .sort((a, b) => {
+ if (a.time_updated === b.time_updated) {
+ return 0;
+ }
+ return a.time_updated > b.time_updated ? -1 : 1;
+ })[0];
+
if (status === ConnectorStatus.Running) {
return (
-
-
-
{status}
+
+
+ {lastSuccessfulAttempt && (
+
+ Last updated {timeAgo(lastSuccessfulAttempt.time_updated)}
+
+ )}
);
}
diff --git a/web/src/components/icons/icons.tsx b/web/src/components/icons/icons.tsx
index f7b576bb8..8c232e62c 100644
--- a/web/src/components/icons/icons.tsx
+++ b/web/src/components/icons/icons.tsx
@@ -1,6 +1,6 @@
"use client";
-import { Globe, SlackLogo } from "@phosphor-icons/react";
+import { Globe, SlackLogo, GithubLogo } from "@phosphor-icons/react";
interface IconProps {
size?: string;
@@ -22,3 +22,10 @@ export const SlackIcon = ({
}: IconProps) => {
return
;
};
+
+export const GithubIcon = ({
+ size = "16",
+ className = defaultTailwindCSS,
+}: IconProps) => {
+ return
;
+};
diff --git a/web/src/components/search/SearchResultsDisplay.tsx b/web/src/components/search/SearchResultsDisplay.tsx
index 7fb981616..8a2e3d793 100644
--- a/web/src/components/search/SearchResultsDisplay.tsx
+++ b/web/src/components/search/SearchResultsDisplay.tsx
@@ -3,6 +3,7 @@ import { Globe, SlackLogo, GoogleDriveLogo } from "@phosphor-icons/react";
import "tailwindcss/tailwind.css";
import { Quote, Document } from "./types";
import { ThinkingAnimation } from "../Thinking";
+import { GithubIcon } from "../icons/icons";
interface SearchResultsDisplayProps {
answer: string | null;
@@ -22,6 +23,8 @@ const getSourceIcon = (sourceType: string) => {
return
;
case "google_drive":
return
;
+ case "github":
+ return
;
default:
return null;
}
@@ -102,7 +105,7 @@ export const SearchResultsDisplay: React.FC
= ({
>
{getSourceIcon(doc.source_type)}
- {doc.semantic_name || doc.document_id}
+ {doc.semantic_identifier || doc.document_id}
{doc.blurb}
diff --git a/web/src/components/search/types.tsx b/web/src/components/search/types.tsx
index 928d006ee..b5f0213dd 100644
--- a/web/src/components/search/types.tsx
+++ b/web/src/components/search/types.tsx
@@ -11,7 +11,7 @@ export interface Document {
link: string;
source_type: string;
blurb: string;
- semantic_name: string | null;
+ semantic_identifier: string | null;
}
export interface SearchResponse {