type clean up

Author: Zuhwa

README.md

@@ -121,10 +121,10 @@ const completedJobs = await acpClient.getCompletedJobs(page, pageSize);
 const cancelledJobs = await acpClient.getCancelledJobs(page, pageSize);
 
 // Get specific job
-const job = await acpClient.getJobByOnChainJobId(onChainJobId);
+const job = await acpClient.getJobById(jobId);
 
 // Get memo by ID
-const memo = await acpClient.getMemoById(onChainJobId, memoId);
+const memo = await acpClient.getMemoById(jobId, memoId);
 ```
 
 ### Agent Discovery

interfaces.ts

@@ -1,4 +1,3 @@
-import { JSONSchemaType } from "ajv";
 import { Address } from "viem";
 
 export type AcpAgent = {
@@ -18,6 +17,7 @@ export type AcpAgent = {
     name: string;
     price: number;
     requirementSchema?: Object;
+    deliverableSchema?: Object;
   }[];
   symbol: string | null;
   virtualAgentId: string | null;

src/acpClient.ts

@@ -5,59 +5,12 @@ import { AcpAgent } from "../interfaces";
 import AcpJob from "./acpJob";
 import AcpMemo from "./acpMemo";
 import AcpJobOffering from "./acpJobOffering";
-
-export interface IDeliverable {
-  type: string;
-  value: string;
-}
-
-interface IAcpMemoData {
-  onChainJobId?: number;
-  type: string;
-  content: string;
-  createdAt: string;
-  memoId: number;
-  memoType: MemoType;
-  nextPhase: AcpJobPhases;
-}
-interface IAcpMemo {
-  data: IAcpMemoData;
-  error?: Error;
-}
-
-interface IAcpJob {
-  data: {
-    onChainJobId: number;
-    phase: AcpJobPhases;
-    description: string;
-    buyerAddress: `0x${string}`;
-    sellerAddress: `0x${string}`;
-    evaluatorAddress: `0x${string}`;
-    price: number;
-    deliverable: IDeliverable | null;
-    memos: IAcpMemoData[];
-    createdAt: string;
-  };
-  error?: Error;
-}
-interface IAcpJobResponse {
-  data: IAcpJob["data"][];
-  meta?: {
-    pagination: {
-      page: number;
-      pageSize: number;
-      pageCount: number;
-      total: number;
-    };
-  };
-  error?: Error;
-}
-
-interface IAcpClientOptions {
-  acpContractClient: AcpContractClient;
-  onNewTask?: (job: AcpJob) => void;
-  onEvaluate?: (job: AcpJob) => void;
-}
+import {
+  IAcpClientOptions,
+  IAcpJob,
+  IAcpJobResponse,
+  IAcpMemo,
+} from "./interfaces";
 
 enum SocketEvents {
   ROOM_JOINED = "roomJoined",
@@ -118,12 +71,14 @@ class AcpClient {
         if (this.onEvaluate) {
           const job = new AcpJob(
             this,
-            data.onChainJobId,
-            data.sellerAddress,
+            data.id,
+            data.clientAddress,
+            data.providerAddress,
+            data.evaluatorAddress,
             data.memos.map((memo) => {
               return new AcpMemo(
                 this,
-                memo.memoId,
+                memo.id,
                 memo.memoType,
                 memo.content,
                 memo.nextPhase
@@ -145,12 +100,14 @@ class AcpClient {
         if (this.onNewTask) {
           const job = new AcpJob(
             this,
-            data.onChainJobId,
-            data.sellerAddress,
+            data.id,
+            data.clientAddress,
+            data.providerAddress,
+            data.evaluatorAddress,
             data.memos.map((memo) => {
               return new AcpMemo(
                 this,
-                memo.memoId,
+                memo.id,
                 memo.memoType,
                 memo.content,
                 memo.nextPhase
@@ -297,12 +254,14 @@ class AcpClient {
       return data.data.map((job) => {
         return new AcpJob(
           this,
-          job.onChainJobId,
-          job.sellerAddress,
+          job.id,
+          job.clientAddress,
+          job.providerAddress,
+          job.evaluatorAddress,
           job.memos.map((memo) => {
             return new AcpMemo(
               this,
-              memo.memoId,
+              memo.id,
               memo.memoType,
               memo.content,
               memo.nextPhase
@@ -335,12 +294,14 @@ class AcpClient {
       return data.data.map((job) => {
         return new AcpJob(
           this,
-          job.onChainJobId,
-          job.sellerAddress,
+          job.id,
+          job.clientAddress,
+          job.providerAddress,
+          job.evaluatorAddress,
           job.memos.map((memo) => {
             return new AcpMemo(
               this,
-              memo.memoId,
+              memo.id,
               memo.memoType,
               memo.content,
               memo.nextPhase
@@ -372,12 +333,14 @@ class AcpClient {
       return data.data.map((job) => {
         return new AcpJob(
           this,
-          job.onChainJobId,
-          job.sellerAddress,
+          job.id,
+          job.clientAddress,
+          job.providerAddress,
+          job.evaluatorAddress,
           job.memos.map((memo) => {
             return new AcpMemo(
               this,
-              memo.memoId,
+              memo.id,
               memo.memoType,
               memo.content,
               memo.nextPhase
@@ -391,8 +354,8 @@ class AcpClient {
     }
   }
 
-  async getJobByOnChainJobId(onChainJobId: number) {
-    let url = `${this.acpUrl}/api/jobs/${onChainJobId}`;
+  async getJobById(jobId: number) {
+    let url = `${this.acpUrl}/api/jobs/${jobId}`;
 
     try {
       const response = await fetch(url, {
@@ -414,12 +377,14 @@ class AcpClient {
 
       return new AcpJob(
         this,
-        job.onChainJobId,
-        job.sellerAddress,
+        job.id,
+        job.clientAddress,
+        job.providerAddress,
+        job.evaluatorAddress,
         job.memos.map((memo) => {
           return new AcpMemo(
             this,
-            memo.memoId,
+            memo.id,
             memo.memoType,
             memo.content,
             memo.nextPhase
@@ -432,8 +397,8 @@ class AcpClient {
     }
   }
 
-  async getMemoById(onChainJobId: number, memoId: number) {
-    let url = `${this.acpUrl}/api/jobs/${onChainJobId}/memos/${memoId}`;
+  async getMemoById(jobId: number, memoId: number) {
+    let url = `${this.acpUrl}/api/jobs/${jobId}/memos/${memoId}`;
 
     try {
       const response = await fetch(url, {
@@ -455,7 +420,7 @@ class AcpClient {
 
       return new AcpMemo(
         this,
-        memo.memoId,
+        memo.id,
         memo.memoType,
         memo.content,
         memo.nextPhase
@@ -464,6 +429,23 @@ class AcpClient {
       throw error;
     }
   }
+
+  async getAgent(walletAddress: Address) {
+    const url = `${this.acpUrl}/api/agents?filters[walletAddress]=${walletAddress}`;
+
+    const response = await fetch(url);
+    const data: {
+      data: AcpAgent[];
+    } = await response.json();
+
+    const agents = data.data || [];
+
+    if (agents.length === 0) {
+      return;
+    }
+
+    return agents[0];
+  }
 }
 
 export default AcpClient;

src/acpJob.ts

@@ -1,3 +1,4 @@
+import { Address } from "viem";
 import AcpClient from "./acpClient";
 import { AcpJobPhases } from "./acpContractClient";
 import AcpMemo from "./acpMemo";
@@ -6,7 +7,9 @@ class AcpJob {
   constructor(
     private acpClient: AcpClient,
     public id: number,
-    public providerAddress: string,
+    public clientAddress: Address,
+    public providerAddress: Address,
+    public evaluatorAddress: Address,
     public memos: AcpMemo[],
     public phase: AcpJobPhases
   ) {}
@@ -21,6 +24,18 @@ class AcpJob {
       ?.content;
   }
 
+  public get providerAgent() {
+    return this.acpClient.getAgent(this.providerAddress);
+  }
+
+  public get clientAgent() {
+    return this.acpClient.getAgent(this.clientAddress);
+  }
+
+  public get evaluatorAgent() {
+    return this.acpClient.getAgent(this.evaluatorAddress);
+  }
+
   async pay(amount: number, reason?: string) {
     const memo = this.memos.find(
       (m) => m.nextPhase === AcpJobPhases.TRANSACTION

src/interfaces.ts

@@ -0,0 +1,55 @@
+import { Address } from "viem";
+import AcpContractClient, { AcpJobPhases, MemoType } from "./acpContractClient";
+import AcpJob from "./acpJob";
+
+export interface IDeliverable {
+  type: string;
+  value: string;
+}
+
+export interface IAcpMemoData {
+  id: number;
+  type: string;
+  content: string;
+  createdAt: string;
+  memoType: MemoType;
+  nextPhase: AcpJobPhases;
+}
+export interface IAcpMemo {
+  data: IAcpMemoData;
+  error?: Error;
+}
+
+export interface IAcpJob {
+  data: {
+    id: number;
+    phase: AcpJobPhases;
+    description: string;
+    clientAddress: Address;
+    providerAddress: Address;
+    evaluatorAddress: Address;
+    price: number;
+    deliverable: IDeliverable | null;
+    memos: IAcpMemoData[];
+    createdAt: string;
+  };
+  error?: Error;
+}
+export interface IAcpJobResponse {
+  data: IAcpJob["data"][];
+  meta?: {
+    pagination: {
+      page: number;
+      pageSize: number;
+      pageCount: number;
+      total: number;
+    };
+  };
+  error?: Error;
+}
+
+export interface IAcpClientOptions {
+  acpContractClient: AcpContractClient;
+  onNewTask?: (job: AcpJob) => void;
+  onEvaluate?: (job: AcpJob) => void;
+}