Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
martha-johnston committed Jan 22, 2025
1 parent 685692c commit d7643fa
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 29 deletions.
6 changes: 4 additions & 2 deletions src/robot/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ export class RobotClient extends EventDispatcher implements Robot {
| PromiseClient<typeof NavigationService>
| undefined;

private discoveryServiceClient: PromiseClient<typeof DiscoveryService> | undefined;
private discoveryServiceClient:
| PromiseClient<typeof DiscoveryService>
| undefined;

private motionServiceClient: PromiseClient<typeof MotionService> | undefined;

Expand Down Expand Up @@ -719,7 +721,7 @@ export class RobotClient extends EventDispatcher implements Robot {
// GET MODELS FROM MODULES

async getModelsFromModules() {
const request = new GetModelsFromModulesRequest({})
const request = new GetModelsFromModulesRequest({});
const resp = await this.robotService.getModelsFromModules(request);
return resp.models;
}
Expand Down
4 changes: 1 addition & 3 deletions src/robot/robot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ export interface Robot {
* @group ComponentConfig
* @alpha
*/
getModelsFromModules(

): Promise<ModuleModel[]>;
getModelsFromModules(): Promise<ModuleModel[]>;

/**
* Get a list of all resources on the robot.
Expand Down
15 changes: 8 additions & 7 deletions src/services/discovery/client.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import {
} from '@connectrpc/connect';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { DiscoveryService } from '../../gen/service/discovery/v1/discovery_connect';
import {
DiscoverResourcesResponse,
} from '../../gen/service/discovery/v1/discovery_pb';
import { DiscoverResourcesResponse } from '../../gen/service/discovery/v1/discovery_pb';
import { RobotClient } from '../../robot';
import { DiscoveryClient } from './client';
import { ComponentConfig } from '../../gen/app/v1/robot_pb';
Expand All @@ -35,16 +33,19 @@ describe('DiscoveryClient Tests', () => {
.mockImplementation(() =>
createPromiseClient(DiscoveryService, mockTransport)
);
discovery = new DiscoveryClient(new RobotClient('host'), discoveryClientName);
discovery = new DiscoveryClient(
new RobotClient('host'),
discoveryClientName
);
});

describe('Discovery Resources Tests', () => {
it('returns resources from a machine', async () => {
const expected = [discoveries];

await expect(
discovery.discoverResources()
).resolves.toStrictEqual(expected);
await expect(discovery.discoverResources()).resolves.toStrictEqual(
expected
);
});
});
});
18 changes: 4 additions & 14 deletions src/services/discovery/client.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
import { Struct, type JsonValue } from '@bufbuild/protobuf';
import type { CallOptions, PromiseClient } from '@connectrpc/connect';
import { DiscoveryService } from '../../gen/service/discovery/v1/discovery_connect';
import {
DiscoverResourcesRequest,
} from '../../gen/service/discovery/v1/discovery_pb';
import { DiscoverResourcesRequest } from '../../gen/service/discovery/v1/discovery_pb';
import type { RobotClient } from '../../robot';
import { doCommandFromClient } from '../../utils';
import type { Options } from '../../types';
import type { Discovery } from './discovery';



/**
* A gRPC-web client for a Vision service.
*
Expand All @@ -28,21 +24,15 @@ export class DiscoveryClient implements Discovery {
this.options = options;
}

async discoverResources(
extra = {},
callOptions = this.callOptions
) {
async discoverResources(extra = {}, callOptions = this.callOptions) {
const request = new DiscoverResourcesRequest({
name: this.name,
extra: extra,
extra: Struct.fromJson(extra),
});

this.options.requestLogger?.(request);

const resp = await this.client.discoverResources(
request,
callOptions
);
const resp = await this.client.discoverResources(request, callOptions);
return resp.discoveries;
}

Expand Down
4 changes: 1 addition & 3 deletions src/services/discovery/discovery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@ export interface Discovery extends Resource {
* @param discoveryName - The name of the discovery service.
* @returns - The list of ComponentConfigs.
*/
discoverResources: (
extra?: Struct
) => Promise<ComponentConfig[]>;
discoverResources: (extra?: Struct) => Promise<ComponentConfig[]>;
}

0 comments on commit d7643fa

Please sign in to comment.