Merge pull request #381 from meemproject/feature/openai

Fix reinitialize for non-contract agreements
meemproject · Apr 7, 2023 · 9a616cc · 9a616cc
2 parents f2b7278 + 8b9ce1f
commit 9a616cc
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 31 deletions.
diff --git a/src/controllers/TestController.ts b/src/controllers/TestController.ts
@@ -14,6 +14,7 @@ import { Op } from 'sequelize'
 import GnosisSafeABI from '../abis/GnosisSafe.json'
 import GnosisSafeProxyABI from '../abis/GnosisSafeProxy.json'
 import meemABI from '../abis/Meem.json'
+import { prompt1, prompt2 } from '../lib/gptPrompts'
 import { Constructor } from '../serverless/cron'
 import { Mycontract__factory } from '../types/Meem'
 import { MeemAPI } from '../types/meem.generated'
@@ -43,8 +44,10 @@ export default class TestController {
 			messages: [
 				{
 					role: 'system',
-					content:
-						"You are a content curator. You will be ingesting messages from the chat rooms of a community. You will then analyze the messages for the best content. You should consider the emoji reactions for each message as well as surrounding context and discussion. Finally, you should summarize the best content and links into a newsletter format where the writer's voice is playful and engaging. You should also include a few jokes and memes."
+					content: prompt2({
+						brandName: 'Tiffany and Co',
+						brandVoice: 'Absurd and weird'
+					})
 				},
 				{
 					role: 'user',

diff --git a/src/lib/gptPrompts.ts b/src/lib/gptPrompts.ts
@@ -0,0 +1,8 @@
+export const prompt1 =
+	"You are a content curator. You will be ingesting messages from the chat rooms of a community. You will then analyze the messages for the best content. You should consider the emoji reactions for each message as well as surrounding context and discussion. Finally, you should summarize the best content and links into a newsletter format where the writer's voice is playful and engaging. You should also include a few jokes and memes."
+
+export const prompt2 = (options: { brandName: string; brandVoice: string }) => {
+	const { brandName, brandVoice } = options
+
+	return `You are a content curator. You will be ingesting messages from the chat rooms of the ${brandName} community. You will then analyze the messages for the best content. You should consider the emoji reactions for each message as well as surrounding context and discussion. Finally, you should summarize the best content and links into a newsletter format where the writer's voice can be described as: ${brandVoice}`
+}
diff --git a/src/services/Agreement.ts b/src/services/Agreement.ts
@@ -172,26 +172,29 @@ export default class AgreementService {
 		// 	params: [contractInitParams],
 		// 	gasLimit: ethers.BigNumber.from(config.MINT_GAS_LIMIT)
 		// })
-		const chainId = agreementOrRole.chainId
+		if (agreementOrRole.isOnChain) {
+			const chainId = agreementOrRole.chainId
 
-		const agreementContract = await services.agreement.getAgreementContract({
-			chainId,
-			address: ethers.constants.AddressZero
-		})
+			const agreementContract = await services.agreement.getAgreementContract({
+				chainId,
+				address: ethers.constants.AddressZero
+			})
 
-		const txId = await services.ethers.queueTransaction({
-			chainId,
-			functionSignature:
-				agreementContract.interface.functions[
-					'reinitialize((string,string,string,(address,bytes32,bool)[],uint256,(uint8,address[],uint256,uint256,uint256,uint256,bytes32)[],(address,uint256,address)[],bool))'
-				].format(),
-			contractAddress: agreementOrRoleContract.address,
-			inputValues: {
-				params: contractInitParams
-			}
-		})
+			const txId = await services.ethers.queueTransaction({
+				chainId,
+				functionSignature:
+					agreementContract.interface.functions[
+						'reinitialize((string,string,string,(address,bytes32,bool)[],uint256,(uint8,address[],uint256,uint256,uint256,uint256,bytes32)[],(address,uint256,address)[],bool))'
+					].format(),
+				contractAddress: agreementOrRoleContract.address,
+				inputValues: {
+					params: contractInitParams
+				}
+			})
+			return { txId }
+		}
 
-		return { txId }
+		return {}
 	}
 
 	public static async createAgreementWithoutContract(options: {

diff --git a/src/types/meem.generated.ts b/src/types/meem.generated.ts
@@ -1819,8 +1819,8 @@ export namespace ReInitializeAgreement {
 	}
 
 	export interface IResponseBody extends IApiResponseBody {
-		/** The Transaction id for updating the contract */
-		txId: string
+		/** The Transaction id for updating the contract. Only available if agreement is on chain */
+		txId?: string
 	}
 
 	export interface IDefinition {
@@ -1873,8 +1873,8 @@ export namespace ReInitializeAgreementRole {
 	}
 
 	export interface IResponseBody extends IApiResponseBody {
-		/** The Transaction id for updating the contract */
-		txId: string
+		/** The Transaction id for updating the contract. Only available if agreement is on chain */
+		txId?: string
 	}
 
 	export interface IDefinition {

diff --git a/src/types/meem.public.generated.ts b/src/types/meem.public.generated.ts
@@ -1750,8 +1750,8 @@ export namespace ReInitializeAgreement {
 	}
 
 	export interface IResponseBody extends IApiResponseBody {
-		/** The Transaction id for updating the contract */
-		txId: string
+		/** The Transaction id for updating the contract. Only available if agreement is on chain */
+		txId?: string
 	}
 
 	export interface IDefinition {
@@ -1804,8 +1804,8 @@ export namespace ReInitializeAgreementRole {
 	}
 
 	export interface IResponseBody extends IApiResponseBody {
-		/** The Transaction id for updating the contract */
-		txId: string
+		/** The Transaction id for updating the contract. Only available if agreement is on chain */
+		txId?: string
 	}
 
 	export interface IDefinition {

diff --git a/src/types/shared/api/agreements/reInitializeAgreement.shared.ts b/src/types/shared/api/agreements/reInitializeAgreement.shared.ts
@@ -49,8 +49,8 @@ export namespace ReInitializeAgreement {
 	}
 
 	export interface IResponseBody extends IApiResponseBody {
-		/** The Transaction id for updating the contract */
-		txId: string
+		/** The Transaction id for updating the contract. Only available if agreement is on chain */
+		txId?: string
 	}
 
 	export interface IDefinition {

diff --git a/src/types/shared/api/agreements/reinitializeAgreementRole.shared.ts b/src/types/shared/api/agreements/reinitializeAgreementRole.shared.ts
@@ -42,8 +42,8 @@ export namespace ReInitializeAgreementRole {
 	}
 
 	export interface IResponseBody extends IApiResponseBody {
-		/** The Transaction id for updating the contract */
-		txId: string
+		/** The Transaction id for updating the contract. Only available if agreement is on chain */
+		txId?: string
 	}
 
 	export interface IDefinition {