New openapi generator - experimental

2025-12-23 05:39:05 +00:00 · 2023-12-20 23:19:24 +07:00
parent 43a3e17c0b
commit a559d4d224
22 changed files with 287 additions and 191 deletions
--- a/www/app/[domain]/browse/page.tsx
+++ b/www/app/[domain]/browse/page.tsx
@@ -72,18 +72,18 @@ export default function TranscriptBrowser() {
                    <></>
                  )}

-                  {item.sourceLanguage ? (
+                  {item.source_language ? (
                    <div className="inline-block bg-blue-500 text-white px-2 py-1 rounded-full text-xs font-semibold">
-                      {item.sourceLanguage}
+                      {item.source_language}
                    </div>
                  ) : (
                    <></>
                  )}
                </div>
                <div className="text-xs text-gray-700">
-                  {new Date(item.createdAt).toLocaleDateString("en-US")}
+                  {new Date(item.created_at).toLocaleDateString("en-US")}
                </div>
-                <div className="text-sm">{item.shortSummary}</div>
+                <div className="text-sm">{item.short_summary}</div>
              </div>
            </div>
          ))}
--- a/www/app/[domain]/transcripts/[transcriptId]/page.tsx
+++ b/www/app/[domain]/transcripts/[transcriptId]/page.tsx
@@ -19,6 +19,7 @@ import { useRouter } from "next/navigation";
 import { faSpinner } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { featureEnabled } from "../../domainContext";
+import { toShareMode } from "../../../lib/shareMode";

 type TranscriptDetails = {
  params: {
@@ -110,10 +111,10 @@ export default function TranscriptDetails(details: TranscriptDetails) {

          <div className="w-full h-full grid grid-rows-layout-one grid-cols-1 gap-2 lg:gap-4">
            <section className=" bg-blue-400/20 rounded-lg md:rounded-xl p-2 md:px-4 h-full">
-              {transcript.response.longSummary ? (
+              {transcript.response.long_summary ? (
                <FinalSummary
                  fullTranscript={fullTranscript}
-                  summary={transcript.response.longSummary}
+                  summary={transcript.response.long_summary}
                  transcriptId={transcript.response.id}
                  openZulipModal={() => setShowModal(true)}
                />
@@ -142,8 +143,8 @@ export default function TranscriptDetails(details: TranscriptDetails) {
              <div className="flex-grow max-w-full">
                <ShareLink
                  transcriptId={transcript?.response?.id}
-                  userId={transcript?.response?.userId}
-                  shareMode={transcript?.response?.shareMode}
+                  userId={transcript?.response?.user_id}
+                  shareMode={toShareMode(transcript?.response?.share_mode)}
                />
              </div>
            </section>
--- a/www/app/[domain]/transcripts/createTranscript.ts
+++ b/www/app/[domain]/transcripts/createTranscript.ts
@@ -1,48 +1,38 @@
-import { useEffect, useState } from "react";
-import {
-  DefaultApi,
-  V1TranscriptsCreateRequest,
-} from "../../api/apis/DefaultApi";
-import { GetTranscript } from "../../api";
+import { useState } from "react";
 import { useError } from "../../(errors)/errorContext";
-import getApi from "../../lib/getApi";
+import { GetTranscript, CreateTranscript } from "../../api";
+import useApi from "../../lib/useApi";

-type CreateTranscript = {
-  response: GetTranscript | null;
+
+type UseTranscript = {
+  transcript: GetTranscript | null;
  loading: boolean;
  error: Error | null;
-  create: (params: V1TranscriptsCreateRequest["createTranscript"]) => void;
+  create: (transcriptCreationDetails: CreateTranscript) => void;
 };

-const useCreateTranscript = (): CreateTranscript => {
-  const [response, setResponse] = useState<GetTranscript | null>(null);
+const useCreateTranscript = (): UseTranscript => {
+  const [transcript, setTranscript] = useState<GetTranscript | null>(null);
  const [loading, setLoading] = useState<boolean>(false);
  const [error, setErrorState] = useState<Error | null>(null);
  const { setError } = useError();
-  const api = getApi();
+  const api = useApi();

-  const create = (params: V1TranscriptsCreateRequest["createTranscript"]) => {
+  const create = (transcriptCreationDetails: CreateTranscript) => {
    if (loading || !api) return;

    setLoading(true);
-    const requestParameters: V1TranscriptsCreateRequest = {
-      createTranscript: {
-        name: params.name || "Unnamed Transcript", // Default
-        targetLanguage: params.targetLanguage || "en", // Default
-      },
-    };

    console.debug(
      "POST - /v1/transcripts/ - Requesting new transcription creation",
-      requestParameters,
+      transcriptCreationDetails,
    );

-    api
-      .v1TranscriptsCreate(requestParameters)
-      .then((result) => {
-        setResponse(result);
+    api.v1TranscriptsCreate(transcriptCreationDetails)
+      .then((transcript) => {
+        setTranscript(transcript);
        setLoading(false);
-        console.debug("New transcript created:", result);
+        console.debug("New transcript created:", transcript);
      })
      .catch((err) => {
        setError(
@@ -54,7 +44,7 @@ const useCreateTranscript = (): CreateTranscript => {
      });
  };

-  return { response, loading, error, create };
+  return { transcript, loading, error, create };
 };

 export default useCreateTranscript;
--- a/www/app/[domain]/transcripts/finalSummary.tsx
+++ b/www/app/[domain]/transcripts/finalSummary.tsx
@@ -2,8 +2,9 @@ import { useRef, useState } from "react";
 import React from "react";
 import Markdown from "react-markdown";
 import "../../styles/markdown.css";
-import getApi from "../../lib/getApi";
 import { featureEnabled } from "../domainContext";
+import { UpdateTranscript } from "../../api";
+import useApi from "../../lib/useApi"; 

 type FinalSummaryProps = {
  summary: string;
@@ -19,17 +20,17 @@ export default function FinalSummary(props: FinalSummaryProps) {
  const [isEditMode, setIsEditMode] = useState(false);
  const [preEditSummary, setPreEditSummary] = useState(props.summary);
  const [editedSummary, setEditedSummary] = useState(props.summary);
-  const api = getApi();

  const updateSummary = async (newSummary: string, transcriptId: string) => {
-    if (!api) return;
    try {
-      const updatedTranscript = await api.v1TranscriptUpdate({
+      const api = useApi();
+      const requestBody: UpdateTranscript = {
+        long_summary: newSummary,
+      };
+      const updatedTranscript = await api?.v1TranscriptUpdate(
        transcriptId,
-        updateTranscript: {
-          longSummary: newSummary,
-        },
-      });
+        requestBody,
+      );
      console.log("Updated long summary:", updatedTranscript);
    } catch (err) {
      console.error("Failed to update long summary:", err);
--- a/www/app/[domain]/transcripts/new/page.tsx
+++ b/www/app/[domain]/transcripts/new/page.tsx
@@ -18,7 +18,7 @@ const TranscriptCreate = () => {
  const isAuthenticated = useFiefIsAuthenticated();
  const requireLogin = featureEnabled("requireLogin");

-  const [name, setName] = useState<string>();
+  const [name, setName] = useState<string>("");
  const nameChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setName(event.target.value);
  };
@@ -35,13 +35,13 @@ const TranscriptCreate = () => {
  const send = () => {
    if (loadingSend || createTranscript.loading || permissionDenied) return;
    setLoadingSend(true);
-    createTranscript.create({ name, targetLanguage });
+    createTranscript.create({ name, target_language: targetLanguage });
  };

  useEffect(() => {
-    createTranscript.response &&
-      router.push(`/transcripts/${createTranscript.response.id}/record`);
-  }, [createTranscript.response]);
+    createTranscript.transcript &&
+      router.push(`/transcripts/${createTranscript.transcript.id}/record`);
+  }, [createTranscript.transcript]);

  useEffect(() => {
    if (createTranscript.error) setLoadingSend(false);
--- a/www/app/[domain]/transcripts/shareLink.tsx
+++ b/www/app/[domain]/transcripts/shareLink.tsx
@@ -1,6 +1,5 @@
 import React, { useState, useRef, useEffect, use } from "react";
 import { featureEnabled } from "../domainContext";
-import getApi from "../../lib/getApi";
 import { useFiefUserinfo } from "@fief/fief/nextjs/react";
 import SelectSearch from "react-select-search";
 import "react-select-search/style.css";
@@ -8,26 +7,30 @@ import "../../styles/button.css";
 import "../../styles/form.scss";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faSpinner } from "@fortawesome/free-solid-svg-icons";
-
+import { DefaultService, UpdateTranscript } from "../../api";
+import { ShareMode, toShareMode } from "../../lib/shareMode";
+import useApi from "../../lib/useApi";
 type ShareLinkProps = {
  transcriptId: string;
  userId: string | null;
-  shareMode: string;
+  shareMode: ShareMode;
 };

 const ShareLink = (props: ShareLinkProps) => {
  const [isCopied, setIsCopied] = useState(false);
+  const [api, setApi] = useState<DefaultService | null>(null);
  const inputRef = useRef<HTMLInputElement>(null);
  const [currentUrl, setCurrentUrl] = useState<string>("");
  const requireLogin = featureEnabled("requireLogin");
  const [isOwner, setIsOwner] = useState(false);
-  const [shareMode, setShareMode] = useState(props.shareMode);
+  const [shareMode, setShareMode] = useState<ShareMode>(props.shareMode);
  const [shareLoading, setShareLoading] = useState(false);
  const userinfo = useFiefUserinfo();
-  const api = getApi();

  useEffect(() => {
    setCurrentUrl(window.location.href);
+    const api = useApi();
+    setApi(api);
  }, []);

  useEffect(() => {
@@ -48,18 +51,24 @@ const ShareLink = (props: ShareLinkProps) => {
  };

  const updateShareMode = async (selectedShareMode: string) => {
-    if (!api) return;
    setShareLoading(true);
-    const updatedTranscript = await api.v1TranscriptUpdate({
-      transcriptId: props.transcriptId,
-      updateTranscript: {
-        shareMode: selectedShareMode,
-      },
-    });
-    setShareMode(updatedTranscript.shareMode);
+    const requestBody: UpdateTranscript = {
+      share_mode: toShareMode(selectedShareMode),
+    };
+    const api = useApi();
+
+    if (!api)
+      throw new Error("ShareLink's API should always be ready at this point");
+
+    const updatedTranscript = await api.v1TranscriptUpdate(
+      props.transcriptId,
+      requestBody,
+    );
+    setShareMode(toShareMode(updatedTranscript.share_mode));
    setShareLoading(false);
  };
  const privacyEnabled = featureEnabled("privacy");
+  const apiReady = api != null;

  return (
    <div
@@ -80,7 +89,7 @@ const ShareLink = (props: ShareLinkProps) => {
            <p>This transcript is public. Everyone can access it.</p>
          )}

-          {isOwner && api && (
+          {isOwner && apiReady (
            <div className="relative">
              <SelectSearch
                className="select-search--top select-search"
@@ -89,7 +98,7 @@ const ShareLink = (props: ShareLinkProps) => {
                  { name: "Secure", value: "semi-private" },
                  { name: "Public", value: "public" },
                ]}
-                value={shareMode}
+                value={shareMode?.toString()}
                onChange={updateShareMode}
                closeOnSelect={true}
              />
--- a/www/app/[domain]/transcripts/transcriptTitle.tsx
+++ b/www/app/[domain]/transcripts/transcriptTitle.tsx
@@ -1,5 +1,6 @@
-import { useState } from "react";
-import getApi from "../../lib/getApi";
+import { useEffect, useState } from "react";
+import { UpdateTranscript } from "../../api";
+import useApi from "../../lib/useApi";

 type TranscriptTitle = {
  title: string;
@@ -10,17 +11,17 @@ const TranscriptTitle = (props: TranscriptTitle) => {
  const [displayedTitle, setDisplayedTitle] = useState(props.title);
  const [preEditTitle, setPreEditTitle] = useState(props.title);
  const [isEditing, setIsEditing] = useState(false);
-  const api = getApi();

  const updateTitle = async (newTitle: string, transcriptId: string) => {
-    if (!api) return;
    try {
-      const updatedTranscript = await api.v1TranscriptUpdate({
+      const requestBody: UpdateTranscript = {
+        title: newTitle,
+      };
+      const api = useApi();
+      const updatedTranscript = await api?.v1TranscriptUpdate(
        transcriptId,
-        updateTranscript: {
-          title: newTitle,
-        },
-      });
+        requestBody,
+      );
      console.log("Updated transcript:", updatedTranscript);
    } catch (err) {
      console.error("Failed to update transcript:", err);
--- a/www/app/[domain]/transcripts/useMp3.ts
+++ b/www/app/[domain]/transcripts/useMp3.ts
@@ -1,6 +1,6 @@
 import { useContext, useEffect, useState } from "react";
 import { DomainContext } from "../domainContext";
-import getApi from "../../lib/getApi";
+import getApi from "../../lib/useApi";
 import { useFiefAccessTokenInfo } from "@fief/fief/build/esm/nextjs/react";

 export type Mp3Response = {
--- a/www/app/[domain]/transcripts/useTopics.ts
+++ b/www/app/[domain]/transcripts/useTopics.ts
@@ -1,11 +1,7 @@
 import { useEffect, useState } from "react";
-import {
-  DefaultApi,
-  V1TranscriptGetTopicsRequest,
-} from "../../api/apis/DefaultApi";
 import { useError } from "../../(errors)/errorContext";
 import { Topic } from "./webSocketTypes";
-import getApi from "../../lib/getApi";
+import useApi from "../../lib/useApi";
 import { shouldShowError } from "../../lib/errorUtils";

 type TranscriptTopics = {
@@ -19,17 +15,13 @@ const useTopics = (id: string): TranscriptTopics => {
  const [loading, setLoading] = useState<boolean>(false);
  const [error, setErrorState] = useState<Error | null>(null);
  const { setError } = useError();
-  const api = getApi();
+  const api = useApi();

  useEffect(() => {
    if (!id || !api) return;

    setLoading(true);
-    const requestParameters: V1TranscriptGetTopicsRequest = {
-      transcriptId: id,
-    };
-    api
-      .v1TranscriptGetTopics(requestParameters)
+    api.v1TranscriptGetTopics(id)
      .then((result) => {
        setTopics(result);
        setLoading(false);
--- a/www/app/[domain]/transcripts/useTranscript.ts
+++ b/www/app/[domain]/transcripts/useTranscript.ts
@@ -1,9 +1,8 @@
 import { useEffect, useState } from "react";
-import { V1TranscriptGetRequest } from "../../api/apis/DefaultApi";
 import { GetTranscript } from "../../api";
 import { useError } from "../../(errors)/errorContext";
-import getApi from "../../lib/getApi";
 import { shouldShowError } from "../../lib/errorUtils";
+import useApi from "../../lib/useApi";

 type ErrorTranscript = {
  error: Error;
@@ -30,17 +29,14 @@ const useTranscript = (
  const [loading, setLoading] = useState<boolean>(true);
  const [error, setErrorState] = useState<Error | null>(null);
  const { setError } = useError();
-  const api = getApi();
+  const api = useApi();

  useEffect(() => {
    if (!id || !api) return;

    setLoading(true);
-    const requestParameters: V1TranscriptGetRequest = {
-      transcriptId: id,
-    };
-    api
-      .v1TranscriptGet(requestParameters)
+
+    api.v1TranscriptGet(id)
      .then((result) => {
        setResponse(result);
        setLoading(false);
@@ -55,7 +51,7 @@ const useTranscript = (
        }
        setErrorState(error);
      });
-  }, [id, !api]);
+  }, [id, api]);

  return { response, loading, error } as
    | ErrorTranscript
--- a/www/app/[domain]/transcripts/useTranscriptList.ts
+++ b/www/app/[domain]/transcripts/useTranscriptList.ts
@@ -1,32 +1,29 @@
 import { useEffect, useState } from "react";
-import { GetTranscriptFromJSON, PageGetTranscript } from "../../api";
 import { useError } from "../../(errors)/errorContext";
-import getApi from "../../lib/getApi";
+import useApi from "../../lib/useApi";
+import { Page_GetTranscript_ } from "../../api";

 type TranscriptList = {
-  response: PageGetTranscript | null;
+  response: Page_GetTranscript_ | null;
  loading: boolean;
  error: Error | null;
 };

 //always protected
 const useTranscriptList = (page: number): TranscriptList => {
-  const [response, setResponse] = useState<PageGetTranscript | null>(null);
+  const [response, setResponse] = useState<Page_GetTranscript_ | null>(null);
  const [loading, setLoading] = useState<boolean>(true);
  const [error, setErrorState] = useState<Error | null>(null);
  const { setError } = useError();
-  const api = getApi();
+  const api = useApi();

  useEffect(() => {
-    if (!api) return;
    setLoading(true);
-    api
-      .v1TranscriptsList({ page })
+    if (!api)
+
+return;
+    api.v1TranscriptsList(page)
      .then((response) => {
-        // issue with API layer, conversion for items is not happening
-        response.items = response.items.map((item) =>
-          GetTranscriptFromJSON(item),
-        );
        setResponse(response);
        setLoading(false);
      })
@@ -36,7 +33,7 @@ const useTranscriptList = (page: number): TranscriptList => {
        setError(err);
        setErrorState(err);
      });
-  }, [!api, page]);
+  }, [api, page]);

  return { response, loading, error };
 };
--- a/www/app/[domain]/transcripts/useWaveform.ts
+++ b/www/app/[domain]/transcripts/useWaveform.ts
@@ -1,8 +1,7 @@
 import { useEffect, useState } from "react";
-import { V1TranscriptGetAudioWaveformRequest } from "../../api/apis/DefaultApi";
 import { AudioWaveform } from "../../api";
 import { useError } from "../../(errors)/errorContext";
-import getApi from "../../lib/getApi";
+import useApi from "../../lib/useApi";
 import { shouldShowError } from "../../lib/errorUtils";

 type AudioWaveFormResponse = {
@@ -16,16 +15,13 @@ const useWaveform = (id: string): AudioWaveFormResponse => {
  const [loading, setLoading] = useState<boolean>(true);
  const [error, setErrorState] = useState<Error | null>(null);
  const { setError } = useError();
-  const api = getApi();
+  const api = useApi();

  useEffect(() => {
    if (!id || !api) return;
    setLoading(true);
-    const requestParameters: V1TranscriptGetAudioWaveformRequest = {
-      transcriptId: id,
-    };
    api
-      .v1TranscriptGetAudioWaveform(requestParameters)
+      .v1TranscriptGetAudioWaveform(id)
      .then((result) => {
        setWaveform(result);
        setLoading(false);
--- a/www/app/[domain]/transcripts/useWebRTC.ts
+++ b/www/app/[domain]/transcripts/useWebRTC.ts
@@ -1,11 +1,8 @@
 import { useEffect, useState } from "react";
 import Peer from "simple-peer";
-import {
-  DefaultApi,
-  V1TranscriptRecordWebrtcRequest,
-} from "../../api/apis/DefaultApi";
 import { useError } from "../../(errors)/errorContext";
-import getApi from "../../lib/getApi";
+import useApi from "../../lib/useApi";
+import { RtcOffer } from "../../api";

 const useWebRTC = (
  stream: MediaStream | null,
@@ -13,10 +10,10 @@ const useWebRTC = (
 ): Peer => {
  const [peer, setPeer] = useState<Peer | null>(null);
  const { setError } = useError();
-  const api = getApi();
+  const api = useApi();

  useEffect(() => {
-    if (!stream || !transcriptId) {
+    if (!stream || !transcriptId || !api) {
      return;
    }

@@ -38,16 +35,13 @@ const useWebRTC = (
    p.on("signal", (data: any) => {
      if (!api) return;
      if ("sdp" in data) {
-        const requestParameters: V1TranscriptRecordWebrtcRequest = {
-          transcriptId: transcriptId,
-          rtcOffer: {
+          const rtcOffer : RtcOffer = {
            sdp: data.sdp,
            type: data.type,
-          },
-        };
+          };

        api
-          .v1TranscriptRecordWebrtc(requestParameters)
+          .v1TranscriptRecordWebrtc(transcriptId, rtcOffer)
          .then((answer) => {
            try {
              p.signal(answer);