chore: replace pipeline type in toolkit with type in sdk

Author: EiffelFly

apps/console/src/app/sitemap.ts

@@ -1,6 +1,7 @@
+import type { Pipeline } from "instill-sdk";
 import { MetadataRoute } from "next";
 
-import { Organization, Pipeline, User } from "@instill-ai/toolkit";
+import { Organization, User } from "@instill-ai/toolkit";
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const sitemaps: MetadataRoute.Sitemap = [];

packages/sdk/src/vdp/release/types.ts

@@ -1,7 +1,5 @@
-import { OpenAPIV3 } from "openapi-types";
-
-import { GeneralRecord, Visibility } from "../../types";
-import { PipelineRecipe } from "../pipeline";
+import { GeneralRecord } from "../../types";
+import { DataSpecification, PipelineRecipe } from "../pipeline";
 
 export type PipelineRelease = {
   name: string;
@@ -11,8 +9,7 @@ export type PipelineRelease = {
   recipe: PipelineRecipe;
   createTime: string;
   updateTime: string;
-  visibility: Visibility;
-  openapiSchema: OpenAPIV3.Document;
+  dataSpecification: DataSpecification;
   metadata: GeneralRecord;
   alias?: string;
 };

packages/toolkit/src/components/ClonePipelineDialog.tsx

@@ -1,9 +1,13 @@
 "use client";
 
+import type {
+  CreateNamespacePipelineRequest,
+  Pipeline,
+  PipelineSharing,
+} from "instill-sdk";
 import * as React from "react";
 import { useRouter } from "next/navigation";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { CreateNamespacePipelineRequest, Pipeline } from "instill-sdk";
 import { useForm } from "react-hook-form";
 import * as z from "zod";
 
@@ -20,7 +24,7 @@ import {
   useToast,
 } from "@instill-ai/design-system";
 
-import type { InstillStore, Nullable, PipelineSharing } from "../lib";
+import type { InstillStore, Nullable } from "../lib";
 import { InstillErrors } from "../constant";
 import {
   sendAmplitudeData,

packages/toolkit/src/components/DeleteResourceModal.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import type { Pipeline } from "instill-sdk";
 import * as React from "react";
 import { shallow } from "zustand/shallow";
 
@@ -9,7 +10,7 @@ import {
   OutlineButton,
 } from "@instill-ai/design-system";
 
-import type { ModalStore, Model, Nullable, Pipeline } from "../lib";
+import type { ModalStore, Model, Nullable } from "../lib";
 import { useModalStore } from "../lib";
 
 export type DeleteResourceModalProps = {

packages/toolkit/src/components/ModelStateLabel.tsx

@@ -1,11 +1,12 @@
 "use client";
 
+import type { ModelState } from "instill-sdk";
 import cn from "clsx";
 
-import type { Nullable, ResourceState } from "../lib";
+import type { Nullable } from "../lib";
 
 export type ModelStateLabelProps = {
-  state?: Nullable<ResourceState>;
+  state?: Nullable<ModelState>;
   className?: string;
 };
 
@@ -48,13 +49,6 @@ export const ModelStateLabel = ({ state, className }: ModelStateLabelProps) => {
       indicatorColor = "bg-semantic-fg-on-default";
       break;
     }
-    case "STATE_INACTIVE": {
-      textColor = "text-semantic-fg-secondary";
-      bgColor = "bg-semantic-bg-secondary";
-      stateLabelName = "Inactive";
-      indicatorColor = "bg-semantic-fg-secondary";
-      break;
-    }
     case "STATE_SCALING": {
       textColor = "text-semantic-warning-hover";
       bgColor = "bg-semantic-warning-bg";

packages/toolkit/src/components/cells/GeneralStateCell.tsx

@@ -1,14 +1,15 @@
 "use client";
 
+import type { ModelState, PipelineReleaseState } from "instill-sdk";
 import { ReactElement } from "react";
 import cn from "clsx";
 
 import { Tag } from "@instill-ai/design-system";
 
-import { Nullable, PipelineTriggerStatus, ResourceState } from "../../lib";
+import { Nullable, PipelineTriggerStatus } from "../../lib";
 
 export type GeneralStateCellProps = {
-  state: ResourceState | PipelineTriggerStatus;
+  state: ModelState | PipelineReleaseState | PipelineTriggerStatus;
   width: Nullable<string>;
   padding: string;
   label?: string;

packages/toolkit/src/constant/pipeline.ts

@@ -1,7 +1,8 @@
+import type { PipelineVariableFieldMap } from "instill-sdk";
 import { Node } from "reactflow";
 
 import type { NodeData, TriggerNodeData } from "../view";
-import { GeneralRecord, Nullable, PipelineVariableFieldMap } from "../lib";
+import { GeneralRecord, Nullable } from "../lib";
 import { env } from "../server";
 import { triggerPipelineSnippet } from "../view/pipeline-builder/components/triggerPipelineSnippet";
 

packages/toolkit/src/lib/dashboard/getPipeLineOptions.ts

@@ -1,6 +1,6 @@
-import { SelectOption } from "@instill-ai/design-system";
+import type { Pipeline } from "instill-sdk";
 
-import { Pipeline } from "../vdp-sdk";
+import { SelectOption } from "@instill-ai/design-system";
 
 export function getPipeLineOptions(pipelines: Pipeline[]): SelectOption[] {
   const formattedPinelineOptions = pipelines?.map((pipeline) => {

packages/toolkit/src/lib/react-query-service/pipeline/useCreateNamespaceSecret.ts

@@ -1,10 +1,9 @@
 "use client";
 
-import type { CreateNamespaceSecretRequest } from "instill-sdk";
+import type { CreateNamespaceSecretRequest, Secret } from "instill-sdk";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import type { Nullable } from "../../type";
-import type { Secret } from "../../vdp-sdk";
 import {
   getUseNamespaceSecretQueryKey,
   getUseNamespaceSecretsQueryKey,

packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespacePipeline.ts

@@ -1,9 +1,9 @@
 "use client";
 
+import type { Pipeline } from "instill-sdk";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import type { Nullable } from "../../type";
-import type { Pipeline } from "../../vdp-sdk";
 import { getInstillAPIClient } from "../../vdp-sdk";
 
 export function useDeleteNamespacePipeline() {

packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespacePipelineRelease.ts

@@ -1,9 +1,9 @@
 "use client";
 
+import type { PipelineRelease } from "instill-sdk";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import type { Nullable } from "../../type";
-import type { PipelineRelease } from "../../vdp-sdk";
 import { getInstillAPIClient } from "../../vdp-sdk";
 
 export function useDeleteNamespacePipelineRelease() {

packages/toolkit/src/lib/react-query-service/pipeline/useDeleteNamespaceSecret.ts

@@ -1,9 +1,9 @@
 "use client";
 
+import type { Secret } from "instill-sdk";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import type { Nullable } from "../../type";
-import type { Secret } from "../../vdp-sdk";
 import { getInstillAPIClient } from "../../vdp-sdk";
 import { getUseNamespaceSecretQueryKey } from "./use-namespace-secret/server";
 import { getUseNamespaceSecretsQueryKey } from "./use-namespace-secrets/server";

packages/toolkit/src/lib/react-query-service/pipeline/useInfiniteNamespacePipelineReleases.ts

@@ -3,13 +3,11 @@ import {
   useInfiniteQuery,
   UseInfiniteQueryResult,
 } from "@tanstack/react-query";
+import { ListNamespacePipelineReleaseResponse } from "instill-sdk";
 
 import { env } from "../../../server";
 import { Nullable } from "../../type";
-import {
-  getInstillAPIClient,
-  ListPipelineReleasesResponse,
-} from "../../vdp-sdk";
+import { getInstillAPIClient } from "../../vdp-sdk";
 
 export function getUseInfiniteNamespacePipelineReleasesQueryKey(
   namespacePipelineName: Nullable<string>,
@@ -33,7 +31,10 @@ export function useInfiniteNamespacePipelineReleases({
   retry?: false | number;
   shareCode?: string;
   disabledViewFull?: boolean;
-}): UseInfiniteQueryResult<InfiniteData<ListPipelineReleasesResponse>, Error> {
+}): UseInfiniteQueryResult<
+  InfiniteData<ListNamespacePipelineReleaseResponse>,
+  Error
+> {
   let enabled = false;
 
   if (namespacePipelineName && enabledQuery) {

packages/toolkit/src/lib/react-query-service/pipeline/useInfinitePipelines.ts

@@ -1,12 +1,12 @@
 "use client";
 
+import type { ListAccessiblePipelineResponse } from "instill-sdk";
 import {
   InfiniteData,
   useInfiniteQuery,
   UseInfiniteQueryResult,
 } from "@tanstack/react-query";
 
-import type { ListPipelinesResponse } from "../../vdp-sdk";
 import { env } from "../../../server";
 import { Nullable } from "../../type";
 import { getInstillAPIClient, Visibility } from "../../vdp-sdk";
@@ -27,7 +27,10 @@ export function useInfinitePipelines({
   filter: Nullable<string>;
   orderBy: Nullable<string>;
   disabledViewFull?: boolean;
-}): UseInfiniteQueryResult<InfiniteData<ListPipelinesResponse>, Error> {
+}): UseInfiniteQueryResult<
+  InfiniteData<ListAccessiblePipelineResponse>,
+  Error
+> {
   const queryKey = ["pipelines", "infinite"];
 
   if (filter) {

packages/toolkit/src/lib/use-instill-form/components/smart-hint/TextArea.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import type { Secret } from "instill-sdk";
 import * as React from "react";
 import cn from "clsx";
 import { useFormContext } from "react-hook-form";
@@ -9,7 +10,6 @@ import { Form, Popover, Textarea } from "@instill-ai/design-system";
 import { InstillCredit } from "../../../../constant";
 import { Nullable } from "../../../type";
 import { useInstillStore } from "../../../use-instill-store";
-import { Secret } from "../../../vdp-sdk";
 import { AutoFormFieldBaseProps, SmartHintWarning } from "../../types";
 import { FieldDescriptionTooltip } from "../common";
 import { getFieldPlaceholder } from "./getFieldPlaceholder";

packages/toolkit/src/lib/use-instill-form/components/smart-hint/TextField.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import type { Secret } from "instill-sdk";
 import * as React from "react";
 import cn from "clsx";
 import { useFormContext } from "react-hook-form";
@@ -9,7 +10,6 @@ import { Form, Input, Popover } from "@instill-ai/design-system";
 import { InstillCredit } from "../../../../constant";
 import { Nullable } from "../../../type";
 import { useInstillStore } from "../../../use-instill-store";
-import { Secret } from "../../../vdp-sdk";
 import { AutoFormFieldBaseProps, SmartHintWarning } from "../../types";
 import { FieldDescriptionTooltip } from "../common";
 import { getFieldPlaceholder } from "./getFieldPlaceholder";

packages/toolkit/src/lib/use-instill-form/components/smart-hint/useFilteredHints.tsx

@@ -1,12 +1,12 @@
 import * as React from "react";
+import { Secret } from "instill-sdk";
 
 import { InstillCredit } from "../../../../constant";
 import { Nullable } from "../../../type";
 import {
   pickSmartHintsFromAcceptFormats,
   SmartHint,
 } from "../../../use-smart-hint";
-import { Secret } from "../../../vdp-sdk";
 
 export function useFilteredHints({
   smartHints,

packages/toolkit/src/lib/use-instill-form/pick/pickPipelineTriggerRequestFormFields.tsx

@@ -1,7 +1,7 @@
+import type { PipelineVariableFieldMap } from "instill-sdk";
 import { UseFormReturn } from "react-hook-form";
 
 import { Nullable } from "../../type";
-import { PipelineVariableFieldMap } from "../../vdp-sdk";
 import { TriggerRequestFormFields } from "../components";
 import { FieldMode, StartOperatorFreeFormFieldItem } from "../types";
 

packages/toolkit/src/lib/use-instill-form/pick/pickRegularFieldsFromInstillFormTree.tsx

@@ -1,8 +1,8 @@
+import type { Secret } from "instill-sdk";
 import * as React from "react";
 import cn from "clsx";
 
 import { GeneralUseFormReturn, Nullable } from "../../type";
-import { Secret } from "../../vdp-sdk";
 import { RegularFields } from "../components";
 import { SmartHintFields } from "../components/smart-hint";
 import {

packages/toolkit/src/lib/use-instill-form/transform/transformPipelineTriggerRequestFieldsToSuperRefineRules.ts

@@ -1,5 +1,6 @@
+import type { PipelineVariableFieldMap } from "instill-sdk";
+
 import { Nullable, SuperRefineRule } from "../../type";
-import { PipelineVariableFieldMap } from "../../vdp-sdk";
 
 export function transformPipelineTriggerRequestFieldsToSuperRefineRules(
   fields: Nullable<PipelineVariableFieldMap>,

packages/toolkit/src/lib/use-instill-form/transform/transformPipelineTriggerRequestFieldsToZod.ts

@@ -1,9 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+import type { PipelineVariableFieldMap } from "instill-sdk";
 import * as z from "zod";
 
 import { Nullable } from "../../type";
-import { PipelineVariableFieldMap } from "../../vdp-sdk";
 
 export function transformPipelineTriggerRequestFieldsToZod(
   fields: Nullable<PipelineVariableFieldMap>,

packages/toolkit/src/lib/use-instill-store/generalSlice.ts

@@ -1,7 +1,7 @@
+import { Secret } from "instill-sdk";
 import { StateCreator } from "zustand";
 
 import { Nullable } from "../type";
-import { Secret } from "../vdp-sdk";
 import { GeneralSlice, InstillStore, InstillStoreMutators } from "./types";
 
 export const createGeneralSlice: StateCreator<

packages/toolkit/src/lib/use-instill-store/types.ts

@@ -1,11 +1,10 @@
-import { TriggerNamespacePipelineResponse } from "instill-sdk";
+import type { Secret, TriggerNamespacePipelineResponse } from "instill-sdk";
 import { Edge, Node, OnConnect, OnEdgesChange, OnNodesChange } from "reactflow";
 
 import { NodeData } from "../../view";
 import { Nullable } from "../type";
 import { InstillJSONSchema } from "../use-instill-form";
 import { SmartHint } from "../use-smart-hint";
-import { Secret } from "../vdp-sdk/pipeline";
 
 export type WarnUnsavedChangesDialogState = {
   open: boolean;

packages/toolkit/src/lib/use-smart-hint/output-reference-hint/pickOutputReferenceHintsFromComponent.tsx

@@ -1,10 +1,11 @@
+import type { PipelineComponent } from "instill-sdk";
+
 import { getGeneralComponentInOutputSchema } from "../../../view";
 import {
   isPipelineGeneralComponent,
   isPipelineIteratorComponent,
 } from "../../../view/pipeline-builder/lib/checkComponentType";
 import { transformInstillJSONSchemaToFormTree } from "../../use-instill-form/transform";
-import { PipelineComponent } from "../../vdp-sdk";
 import { transformFormTreeToSmartHints } from "../transformFormTreeToSmartHints";
 import { SmartHint } from "../types";
 

packages/toolkit/src/lib/use-smart-hint/output-reference-hint/useOutputReferenceHintsFields.tsx

@@ -1,7 +1,7 @@
+import type { PipelineComponent } from "instill-sdk";
 import * as React from "react";
 
 import { Nullable } from "../../type";
-import { PipelineComponent } from "../../vdp-sdk";
 import { pickFieldsFromOutputReferenceHints } from "./pickFieldsFromOutputReferenceHints";
 import { pickOutputReferenceHintsFromComponent } from "./pickOutputReferenceHintsFromComponent";
 

packages/toolkit/src/lib/use-smart-hint/transformPipelineTriggerRequestFieldsToSmartHints.test.ts

@@ -1,6 +1,6 @@
+import type { PipelineVariableFieldMap } from "instill-sdk";
 import { expect, test } from "vitest";
 
-import { PipelineVariableFieldMap } from "../vdp-sdk";
 import { transformPipelineTriggerRequestFieldsToSmartHints } from "./transformPipelineTriggerRequestFieldsToSmartHints";
 
 test("should transform pipeline variables to smart hints", () => {

packages/toolkit/src/lib/use-smart-hint/transformPipelineTriggerRequestFieldsToSmartHints.ts

@@ -1,4 +1,5 @@
-import { PipelineVariableFieldMap } from "../vdp-sdk";
+import type { PipelineVariableFieldMap } from "instill-sdk";
+
 import { SmartHint } from "./types";
 
 export function transformPipelineTriggerRequestFieldsToSmartHints(

packages/toolkit/src/lib/vdp-sdk/helper/checkIsDefinition.ts

@@ -1,5 +1,8 @@
-import { ConnectorDefinition } from "../connector";
-import { IteratorDefinition, OperatorDefinition } from "../pipeline";
+import {
+  ConnectorDefinition,
+  IteratorDefinition,
+  OperatorDefinition,
+} from "instill-sdk";
 
 export function isConnectorDefinition(
   definition: IteratorDefinition | ConnectorDefinition | OperatorDefinition,

packages/toolkit/src/lib/vdp-sdk/index.ts

@@ -11,7 +11,6 @@ export * from "./mgmt";
 export * from "./model";
 export * from "./operation";
 export * from "./organization";
-export * from "./pipeline";
 export * from "./types";
 
 export * from "./helper";

packages/toolkit/src/lib/vdp-sdk/metric/pipeline/types.ts

@@ -1,4 +1,4 @@
-import { PipelineMode, PipelineReleaseState } from "../../pipeline";
+import { PipelineMode, PipelineReleaseState } from "instill-sdk";
 
 export type PipelineTriggerCount = {
   pipelineId: string;