Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions intelligence/ts/.prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pnpm-lock.yaml
.next/
19 changes: 6 additions & 13 deletions intelligence/ts/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import eslint from '@eslint/js';
import importPlugin from 'eslint-plugin-import';
import simpleImportSort from 'eslint-plugin-simple-import-sort';
import tseslint from 'typescript-eslint';

export default tseslint.config(
Expand All @@ -9,8 +9,10 @@ export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.stylisticTypeChecked,
...tseslint.configs.strictTypeChecked,
importPlugin.flatConfigs.recommended,
{
plugins: {
'simple-import-sort': simpleImportSort,
},
languageOptions: {
parserOptions: {
projectService: true,
Expand All @@ -20,7 +22,8 @@ export default tseslint.config(
sourceType: 'module',
},
rules: {
'import/order': 2,
'simple-import-sort/imports': 'error',
'simple-import-sort/exports': 'error',
'@typescript-eslint/no-unused-vars': [
'error',
{
Expand All @@ -34,15 +37,5 @@ export default tseslint.config(
},
],
},
settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx'],
},
'import/resolver': {
typescript: {
alwaysTryTypes: true, // always try to resolve types under `<root>@types` directory even it doesn't contain any source code, like `@types/unist`
},
},
},
}
);
11 changes: 3 additions & 8 deletions intelligence/ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,11 @@
"test": "NODE_PATH=./src NODE_ENV=test vitest"
},
"devDependencies": {
"@eslint/eslintrc": "^3.3.3",
"@eslint/js": "^9.39.2",
"@typescript-eslint/eslint-plugin": "^8.56.0",
"@typescript-eslint/parser": "^8.56.0",
"eslint": "^9.39.2",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import": "^2.32.0",
"@eslint/js": "^10.0.1",
"eslint": "^10.0.1",
"eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^16.5.0",
"http-server": "^14.1.1",
"minimatch": "10.2.2",
"prettier": "^3.8.1",
"typedoc": "^0.28.17",
"typedoc-plugin-markdown": "^4.10.0",
Expand Down
1,813 changes: 225 additions & 1,588 deletions intelligence/ts/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions intelligence/ts/src/engines/common/storage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// limitations under the License.
// =============================================================================

import path from 'path';
import os from 'os';
import { describe, it, expect, beforeEach, vi } from 'vitest';
import path from 'path';
import { beforeEach, describe, expect, it, vi } from 'vitest';

// --- In-memory file system ---
// This object will simulate our file system.
Expand Down
5 changes: 3 additions & 2 deletions intelligence/ts/src/engines/remoteEngine.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
// limitations under the License.
// =============================================================================

import { assert, describe, it, expect, beforeEach, vi } from 'vitest';
import { assert, beforeEach, describe, expect, it, vi } from 'vitest';

import { CryptographyHandler } from './remoteEngine/cryptoHandler';
import { getTimestamp } from './remoteEngine/cryptoUtils';
import { KeyManager } from './remoteEngine/keyManager';
import { NetworkService } from './remoteEngine/networkService';
import { getTimestamp } from './remoteEngine/cryptoUtils';

const API_KEY = process.env.FI_API_KEY ?? '';
const REMOTE_URL = process.env.FI_DEV_REMOTE_URL ?? '';
Expand Down
6 changes: 3 additions & 3 deletions intelligence/ts/src/engines/remoteEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ import {
ToolChoice,
} from '../typing';
import { BaseEngine } from './engine';
import { ChatCompletionsResponse, EmbedResponse } from './remoteEngine/typing';
import { chatStream, extractChatOutput } from './remoteEngine/chat';
import { CryptographyHandler } from './remoteEngine/cryptoHandler';
import { extractEmbedOutput } from './remoteEngine/embed';
import {
createChatRequestData,
createEmbedRequestData,
getHeaders,
sendRequest,
} from './remoteEngine/remoteUtils';
import { chatStream, extractChatOutput } from './remoteEngine/chat';
import { extractEmbedOutput } from './remoteEngine/embed';
import { ChatCompletionsResponse, EmbedResponse } from './remoteEngine/typing';

export class RemoteEngine extends BaseEngine {
private baseUrl: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// =============================================================================

import getRandomValues from 'get-random-values';

import { FailureCode, Message, Result } from '../../typing';
import { KeyManager } from './keyManager';
import { NetworkService } from './networkService';
Expand Down
13 changes: 6 additions & 7 deletions intelligence/ts/src/engines/transformersEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,27 @@
// limitations under the License.
// =============================================================================

import type { ProgressInfo, TextGenerationConfig } from '@huggingface/transformers';
import {
InterruptableStoppingCriteria,
pipeline,
StoppingCriteriaList,
Tensor,
TextGenerationPipeline,
TextStreamer,
pipeline,
} from '@huggingface/transformers';

import type { ProgressInfo, TextGenerationConfig } from '@huggingface/transformers';
import { getAvailableRAM } from '../env';
import {
ChatResponseResult,
FailureCode,
Message,
Result,
Progress,
ChatResponseResult,
ResponseFormat,
Result,
} from '../typing';

import { getAvailableRAM } from '../env';
import { BaseEngine } from './engine';
import { getEngineModelConfig } from './common/model';
import { BaseEngine } from './engine';

const stoppingCriteria = new InterruptableStoppingCriteria();
const choice = 0;
Expand Down
5 changes: 3 additions & 2 deletions intelligence/ts/src/engines/webllmEngine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import {
type InitProgressReport,
type MLCEngineInterface,
} from '@mlc-ai/web-llm';

import { getAvailableRAM } from '../env';
import {
ChatResponseResult,
FailureCode,
Expand All @@ -30,9 +32,8 @@ import {
Tool,
ToolChoice,
} from '../typing';
import { getAvailableRAM } from '../env';
import { BaseEngine } from './engine';
import { getEngineModelConfig } from './common/model';
import { BaseEngine } from './engine';

async function runQuery(
engine: MLCEngineInterface,
Expand Down
4 changes: 2 additions & 2 deletions intelligence/ts/src/flowerintelligence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
// limitations under the License.
// =============================================================================

import { ALLOWED_ROLES, DEFAULT_MODEL } from './constants';
import { Engine } from './engines/engine';
import { RemoteEngine } from './engines/remoteEngine';
import { isNode } from './env';
import {
ChatOptions,
ChatResponseResult,
Expand All @@ -26,8 +28,6 @@ import {
Progress,
Result,
} from './typing';
import { ALLOWED_ROLES, DEFAULT_MODEL } from './constants';
import { isNode } from './env';

/**
* Class representing the core intelligence service for Flower Labs.
Expand Down
2 changes: 1 addition & 1 deletion intelligence/ts/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
// =============================================================================

export { FlowerIntelligence } from './flowerintelligence';
export { FailureCode } from './typing';
export type {
ChatOptions,
ChatResponseResult,
Expand All @@ -35,3 +34,4 @@ export type {
ToolParameterProperty,
Usage,
} from './typing';
export { FailureCode } from './typing';
Loading