Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily remove api_keys fields until backend is released #7336

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Temporarily remove api_keys fields until backend is released #7336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 17 additions & 15 deletions frontend/openchat-agent/src/services/common/chatMappersV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ import type {
BotMessageContext,
SlashCommandParamInstance,
GenerateBotKeyResponse,
PublicApiKeyDetails,
// PublicApiKeyDetails,
} from "openchat-shared";
import {
ProposalDecisionStatus,
Expand Down Expand Up @@ -307,7 +307,7 @@ import type {
BotDefinition as ApiBotDefinition,
CommunityGenerateBotApiKeyResponse,
GroupGenerateBotApiKeyResponse,
PublicApiKeyDetails as ApiPublicApiKeyDetails,
// PublicApiKeyDetails as ApiPublicApiKeyDetails,
} from "../../typebox";

const E8S_AS_BIGINT = BigInt(100_000_000);
Expand Down Expand Up @@ -2690,23 +2690,24 @@ export function groupDetailsResponse(
rules: value.Success.chat_rules,
timestamp: value.Success.timestamp,
bots: bots.map(botGroupDetails),
apiKeys: value.Success.api_keys.map(publicApiKeyDetails).reduce((m, k) => {
m.set(k.botId, k);
return m;
}, new Map<string, PublicApiKeyDetails>()),
apiKeys: new Map(),
// apiKeys: value.Success.api_keys.map(publicApiKeyDetails).reduce((m, k) => {
// m.set(k.botId, k);
// return m;
// }, new Map<string, PublicApiKeyDetails>()),
};
}
throw new UnsupportedValueError("Unexpected ApiDeleteMessageResponse type received", value);
}

export function publicApiKeyDetails(value: ApiPublicApiKeyDetails): PublicApiKeyDetails {
return {
botId: principalBytesToString(value.bot_id),
grantedPermissions: externalBotPermissions(value.granted_permissions),
generatedBy: principalBytesToString(value.generated_by),
generatedAt: value.generated_at,
};
}
// export function publicApiKeyDetails(value: ApiPublicApiKeyDetails): PublicApiKeyDetails {
// return {
// botId: principalBytesToString(value.bot_id),
// grantedPermissions: externalBotPermissions(value.granted_permissions),
// generatedBy: principalBytesToString(value.generated_by),
// generatedAt: value.generated_at,
// };
// }

export function groupDetailsUpdatesResponse(
value: GroupSelectedUpdatesResponse | CommunitySelectedChannelUpdatesResponse,
Expand All @@ -2733,7 +2734,8 @@ export function groupDetailsUpdatesResponse(
timestamp: value.Success.timestamp,
botsAddedOrUpdated: value.Success.bots_added_or_updated.map(botGroupDetails),
botsRemoved: new Set(value.Success.bots_removed.map(principalBytesToString)),
apiKeysGenerated: value.Success.api_keys_generated.map(publicApiKeyDetails),
apiKeysGenerated: [],
// apiKeysGenerated: value.Success.api_keys_generated.map(publicApiKeyDetails),
};
} else if ("SuccessNoUpdates" in value) {
return {
Expand Down
16 changes: 9 additions & 7 deletions frontend/openchat-agent/src/services/community/mappersV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import type {
GroupMembershipUpdates,
ImportGroupResponse,
MemberRole,
PublicApiKeyDetails,
// PublicApiKeyDetails,
RemoveMemberResponse,
SendMessageResponse,
SetMemberDisplayNameResponse,
Expand Down Expand Up @@ -80,7 +80,7 @@ import {
memberRole,
mentions,
messageEvent,
publicApiKeyDetails,
// publicApiKeyDetails,
threadSyncDetails,
updatedEvent,
userGroup,
Expand Down Expand Up @@ -473,10 +473,11 @@ export function communityDetailsResponse(
userGroups: new Map(value.Success.user_groups.map(userGroupDetails)),
referrals: new Set(value.Success.referrals.map(principalBytesToString)),
bots: value.Success.bots.map(botGroupDetails),
apiKeys: value.Success.api_keys.map(publicApiKeyDetails).reduce((m, k) => {
m.set(k.botId, k);
return m;
}, new Map<string, PublicApiKeyDetails>()),
apiKeys: new Map(),
// apiKeys: value.Success.api_keys.map(publicApiKeyDetails).reduce((m, k) => {
// m.set(k.botId, k);
// return m;
// }, new Map<string, PublicApiKeyDetails>()),
};
} else {
console.warn("CommunityDetails failed with", value);
Expand Down Expand Up @@ -530,7 +531,8 @@ export function communityDetailsUpdatesResponse(
referralsAdded: new Set(value.Success.referrals_added.map(principalBytesToString)),
botsAddedOrUpdated: value.Success.bots_added_or_updated.map(botGroupDetails),
botsRemoved: new Set(value.Success.bots_removed.map(principalBytesToString)),
apiKeysGenerated: value.Success.api_keys_generated.map(publicApiKeyDetails),
apiKeysGenerated: [],
// apiKeysGenerated: value.Success.api_keys_generated.map(publicApiKeyDetails),
};
} else if ("SuccessNoUpdates" in value) {
return {
Expand Down
5 changes: 0 additions & 5 deletions frontend/openchat-agent/src/typebox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6673,7 +6673,6 @@ export const SelectedGroupUpdates = Type.Object({
members_removed: Type.Array(UserId),
bots_added_or_updated: Type.Array(BotGroupDetails),
bots_removed: Type.Array(UserId),
api_keys_generated: Type.Array(PublicApiKeyDetails),
blocked_users_added: Type.Array(UserId),
blocked_users_removed: Type.Array(UserId),
invited_users: Type.Optional(Type.Union([Type.Array(UserId), Type.Undefined()])),
Expand Down Expand Up @@ -7043,7 +7042,6 @@ export const CommunitySelectedChannelInitialSuccessResult = Type.Object({
invited_users: Type.Array(UserId),
pinned_messages: Type.Array(MessageIndex),
chat_rules: VersionedRules,
api_keys: Type.Array(PublicApiKeyDetails),
});

export type CommunityCommunityMembersResponse = Static<typeof CommunityCommunityMembersResponse>;
Expand Down Expand Up @@ -7090,7 +7088,6 @@ export const CommunitySelectedInitialSuccessResult = Type.Object({
latest_event_index: EventIndex,
members: Type.Array(CommunityMember),
bots: Type.Array(BotGroupDetails),
api_keys: Type.Array(PublicApiKeyDetails),
basic_members: Type.Array(UserId),
blocked_users: Type.Array(UserId),
invited_users: Type.Array(UserId),
Expand Down Expand Up @@ -7122,7 +7119,6 @@ export const CommunitySelectedUpdatesSuccessResult = Type.Object({
members_removed: Type.Array(UserId),
bots_added_or_updated: Type.Array(BotGroupDetails),
bots_removed: Type.Array(UserId),
api_keys_generated: Type.Array(PublicApiKeyDetails),
blocked_users_added: Type.Array(UserId),
blocked_users_removed: Type.Array(UserId),
invited_users: Type.Optional(Type.Union([Type.Array(UserId), Type.Undefined()])),
Expand Down Expand Up @@ -7183,7 +7179,6 @@ export const GroupSelectedInitialSuccessResult = Type.Object({
latest_event_index: EventIndex,
participants: Type.Array(GroupMember),
bots: Type.Array(BotGroupDetails),
api_keys: Type.Array(PublicApiKeyDetails),
basic_members: Type.Array(UserId),
blocked_users: Type.Array(UserId),
invited_users: Type.Array(UserId),
Expand Down
Loading