Skip to content

Commit 0491451

Browse files
authored
Merge branch 'develop' into develop
2 parents b6a9107 + 88dfc91 commit 0491451

20 files changed

+1609
-239
lines changed

.github/workflows/pnpm-lockfile-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Pnpm Lockfile Check
22

33
on:
44
pull_request:
5-
branches: ["*"]
5+
branches: [main]
66

77
jobs:
88
check-lockfile:
@@ -38,4 +38,4 @@ jobs:
3838
owner: context.repo.owner,
3939
repo: context.repo.repo,
4040
body: '❌ The pnpm-lockfile is out of date. Please run `pnpm install --no-frozen-lockfile` and commit the updated pnpm-lock.yaml file.'
41-
})
41+
})

packages/core/src/models.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import settings from "./settings.ts";
22
import {
3-
Models,
4-
ModelProviderName,
3+
EmbeddingModelSettings,
4+
ImageModelSettings,
55
ModelClass,
6+
ModelProviderName,
7+
Models,
68
ModelSettings,
7-
ImageModelSettings,
8-
EmbeddingModelSettings,
99
} from "./types.ts";
1010

1111
export const models: Models = {
@@ -332,6 +332,7 @@ export const models: Models = {
332332
},
333333
},
334334
[ModelProviderName.GOOGLE]: {
335+
endpoint: "https://generativelanguage.googleapis.com",
335336
model: {
336337
[ModelClass.SMALL]: {
337338
name:

packages/core/src/types.ts

+42
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,47 @@ export interface IAwsS3Service extends Service {
13341334
generateSignedUrl(fileName: string, expiresIn: number): Promise<string>;
13351335
}
13361336

1337+
export interface UploadIrysResult {
1338+
success: boolean;
1339+
url?: string;
1340+
error?: string;
1341+
data?: any;
1342+
}
1343+
1344+
export interface DataIrysFetchedFromGQL {
1345+
success: boolean;
1346+
data: any;
1347+
error?: string;
1348+
}
1349+
1350+
export interface GraphQLTag {
1351+
name: string;
1352+
values: any[];
1353+
}
1354+
1355+
export const enum IrysMessageType {
1356+
REQUEST = "REQUEST",
1357+
DATA_STORAGE = "DATA_STORAGE",
1358+
REQUEST_RESPONSE = "REQUEST_RESPONSE",
1359+
}
1360+
1361+
export const enum IrysDataType {
1362+
FILE = "FILE",
1363+
IMAGE = "IMAGE",
1364+
OTHER = "OTHER",
1365+
}
1366+
1367+
export interface IrysTimestamp {
1368+
from: number;
1369+
to: number;
1370+
}
1371+
1372+
export interface IIrysService extends Service {
1373+
getDataFromAnAgent(agentsWalletPublicKeys: string[], tags: GraphQLTag[], timestamp: IrysTimestamp): Promise<DataIrysFetchedFromGQL>;
1374+
workerUploadDataOnIrys(data: any, dataType: IrysDataType, messageType: IrysMessageType, serviceCategory: string[], protocol: string[], validationThreshold: number[], minimumProviders: number[], testProvider: boolean[], reputation: number[]): Promise<UploadIrysResult>;
1375+
providerUploadDataOnIrys(data: any, dataType: IrysDataType, serviceCategory: string[], protocol: string[]): Promise<UploadIrysResult>;
1376+
}
1377+
13371378
export interface ITeeLogService extends Service {
13381379
getInstance(): ITeeLogService;
13391380
log(
@@ -1379,6 +1420,7 @@ export enum ServiceType {
13791420
AWS_S3 = "aws_s3",
13801421
BUTTPLUG = "buttplug",
13811422
SLACK = "slack",
1423+
IRYS = "irys",
13821424
TEE_LOG = "tee_log",
13831425
GOPLUS_SECURITY = "goplus_security",
13841426
}

packages/plugin-irys/.npmignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*
2+
3+
!dist/**
4+
!package.json
5+
!readme.md
6+
!tsup.config.ts
53.3 KB
Loading

0 commit comments

Comments
 (0)