Skip to content

Commit f986bbe

Browse files
committed
resolve conflicts
1 parent 7860689 commit f986bbe

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

sdks/ts/packages/golem-ts-sdk/src/internal/clientGeneration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ function serializeArgs(params: CachedParamInfo[], fnArgs: any[]): DataValue {
431431
'Internal error: Value of `Principal` should not be serialized at any point during RPC call',
432432
);
433433
case 'config':
434-
return Either.left(
434+
throw new Error(
435435
'Internal error: Value of `Config` should not be serialized at any point during RPC call',
436436
);
437437
case 'multimodal': {

sdks/ts/packages/golem-ts-sdk/src/internal/mapping/values/dataValue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import * as Value from '../values/Value';
4242
import { getLanguageCodes, getMimeTypes } from '../../schema/helpers';
4343
import { Config, Secret } from '../../..';
4444
import { Type } from '@golemcloud/golem-ts-types-core';
45-
import { getConfigValue } from 'golem:agent/host';
45+
import { getConfigValue } from 'golem:agent/host@1.5.0';
4646

4747
export type ParameterDetail = {
4848
name: string;

sdks/ts/packages/golem-ts-sdk/tests/agentConfig.test.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,9 @@
1313
// limitations under the License.
1414

1515
import { describe, it } from 'vitest';
16-
import { getHttpMountDetails } from '../src/internal/http/mount';
1716
import { AgentClassName, AgentDecoratorOptions } from '../src';
18-
import { parseQuery } from '../src/internal/http/query';
19-
import { AgentMethod, HttpEndpointDetails, HttpMountDetails } from 'golem:agent/common';
20-
import { validateHttpEndpoint, validateHttpMount } from '../src/internal/http/validation';
2117
import { TypeMetadata } from '@golemcloud/golem-ts-types-core';
2218
import { AgentTypeRegistry } from '../src/internal/registry/agentTypeRegistry';
23-
import { tuple } from 'fast-check';
2419

2520
describe('agent config handling', () => {
2621
it('correctly describes a complex config type', () => {

0 commit comments

Comments
 (0)