Skip to content

πŸ™Œ OpenHands: AI-Driven Development

refactor(frontend): move user APIs to a dedicated service handler (#10943)

Hiep Le74753036bb58
diff --git a/frontend/__tests__/components/features/home/repo-connector.test.tsx b/frontend/__tests__/components/features/home/repo-connector.test.tsx
index fd62bfd138..97e2b7df7c 100644
--- a/frontend/__tests__/components/features/home/repo-connector.test.tsx
+++ b/frontend/__tests__/components/features/home/repo-connector.test.tsx
@@ -7,6 +7,7 @@ import { Provider } from "react-redux";
import { createRoutesStub, Outlet } from "react-router";
import SettingsService from "#/settings-service/settings-service.api";
import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import OptionService from "#/api/option-service/option-service.api";
import { GitRepository } from "#/types/git";
import { RepoConnector } from "#/components/features/home/repo-connector";
@@ -86,7 +87,7 @@ describe("RepoConnector", () => {
it("should render the available repositories in the dropdown", async () => {
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -95,7 +96,7 @@ describe("RepoConnector", () => {
});
// Mock the search function that's used by the dropdown
- vi.spyOn(OpenHands, "searchGitRepositories").mockResolvedValue(
+ vi.spyOn(GitService, "searchGitRepositories").mockResolvedValue(
MOCK_RESPOSITORIES,
);
@@ -123,7 +124,7 @@ describe("RepoConnector", () => {
it("should only enable the launch button if a repo is selected", async () => {
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -137,7 +138,7 @@ describe("RepoConnector", () => {
expect(launchButton).toBeDisabled();
// Mock the repository branches API call
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [
{ name: "main", commit_sha: "123", protected: false },
{ name: "develop", commit_sha: "456", protected: false },
@@ -195,7 +196,7 @@ describe("RepoConnector", () => {
});
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -242,7 +243,7 @@ describe("RepoConnector", () => {
});
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -286,7 +287,7 @@ describe("RepoConnector", () => {
});
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -329,7 +330,7 @@ describe("RepoConnector", () => {
session_api_key: null,
});
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -348,7 +349,7 @@ describe("RepoConnector", () => {
expect(createConversationSpy).not.toHaveBeenCalled();
// Mock the repository branches API call
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [
{ name: "main", commit_sha: "123", protected: false },
{ name: "develop", commit_sha: "456", protected: false },
@@ -402,7 +403,7 @@ describe("RepoConnector", () => {
const createConversationSpy = vi.spyOn(OpenHands, "createConversation");
createConversationSpy.mockImplementation(() => new Promise(() => {})); // Never resolves to keep loading state
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -411,7 +412,7 @@ describe("RepoConnector", () => {
});
// Mock the repository branches API call
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [
{ name: "main", commit_sha: "123", protected: false },
{ name: "develop", commit_sha: "456", protected: false },
diff --git a/frontend/__tests__/components/features/home/repo-selection-form.test.tsx b/frontend/__tests__/components/features/home/repo-selection-form.test.tsx
index 35abfa8c69..a34163ff6e 100644
--- a/frontend/__tests__/components/features/home/repo-selection-form.test.tsx
+++ b/frontend/__tests__/components/features/home/repo-selection-form.test.tsx
@@ -3,6 +3,8 @@ import { describe, expect, vi, beforeEach, it } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { RepositorySelectionForm } from "../../../../src/components/features/home/repo-selection-form";
import OpenHands from "#/api/open-hands";
+import UserService from "#/api/user-service/user-service.api";
+import GitService from "#/api/git-service/git-service.api";
import { GitRepository } from "#/types/git";
// Create mock functions
@@ -204,7 +206,7 @@ describe("RepositorySelectionForm", () => {
];
// Create a spy on the API call
- const searchGitReposSpy = vi.spyOn(OpenHands, "searchGitRepositories");
+ const searchGitReposSpy = vi.spyOn(GitService, "searchGitRepositories");
searchGitReposSpy.mockResolvedValue(MOCK_SEARCH_REPOS);
mockUseGitRepositories.mockReturnValue({
diff --git a/frontend/__tests__/components/features/home/task-card.test.tsx b/frontend/__tests__/components/features/home/task-card.test.tsx
index d4a49a0ef8..b8be487729 100644
--- a/frontend/__tests__/components/features/home/task-card.test.tsx
+++ b/frontend/__tests__/components/features/home/task-card.test.tsx
@@ -6,6 +6,8 @@ import { Provider } from "react-redux";
import { createRoutesStub } from "react-router";
import { setupStore } from "test-utils";
import OpenHands from "#/api/open-hands";
+import UserService from "#/api/user-service/user-service.api";
+import GitService from "#/api/git-service/git-service.api";
import { TaskCard } from "#/components/features/home/tasks/task-card";
import { GitRepository } from "#/types/git";
import { SuggestedTask } from "#/utils/types";
@@ -70,7 +72,7 @@ describe("TaskCard", () => {
describe("creating suggested task conversation", () => {
beforeEach(() => {
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
diff --git a/frontend/__tests__/components/features/microagent-management/microagent-management.test.tsx b/frontend/__tests__/components/features/microagent-management/microagent-management.test.tsx
index ecbb078b47..f342485d37 100644
--- a/frontend/__tests__/components/features/microagent-management/microagent-management.test.tsx
+++ b/frontend/__tests__/components/features/microagent-management/microagent-management.test.tsx
@@ -8,6 +8,7 @@ import { renderWithProviders } from "test-utils";
import MicroagentManagement from "#/routes/microagent-management";
import { MicroagentManagementMain } from "#/components/features/microagent-management/microagent-management-main";
import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { GitRepository } from "#/types/git";
import { RepositoryMicroagent } from "#/types/microagent-management";
import { Conversation } from "#/api/open-hands.types";
@@ -231,12 +232,12 @@ describe("MicroagentManagement", () => {
});
// Setup default mock for retrieveUserGitRepositories
- vi.spyOn(OpenHands, "retrieveUserGitRepositories").mockResolvedValue({
+ vi.spyOn(GitService, "retrieveUserGitRepositories").mockResolvedValue({
data: [...mockRepositories],
nextPage: null,
});
// Setup default mock for getRepositoryMicroagents
- vi.spyOn(OpenHands, "getRepositoryMicroagents").mockResolvedValue([
+ vi.spyOn(GitService, "getRepositoryMicroagents").mockResolvedValue([
...mockMicroagents,
]);
// Setup default mock for searchConversations
@@ -244,7 +245,7 @@ describe("MicroagentManagement", () => {
...mockConversations,
]);
// Setup default mock for getRepositoryMicroagentContent
- vi.spyOn(OpenHands, "getRepositoryMicroagentContent").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryMicroagentContent").mockResolvedValue({
content: "Original microagent content for testing updates",
path: ".openhands/microagents/update-test-microagent",
git_provider: "github",
@@ -1290,7 +1291,7 @@ describe("MicroagentManagement", () => {
// Add microagent integration tests
describe("Add microagent functionality", () => {
beforeEach(() => {
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [{ name: "main", commit_sha: "abc123", protected: false }],
has_next_page: false,
current_page: 1,
@@ -1983,7 +1984,7 @@ describe("MicroagentManagement", () => {
};
beforeEach(() => {
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [{ name: "main", commit_sha: "abc123", protected: false }],
has_next_page: false,
current_page: 1,
@@ -2314,7 +2315,7 @@ describe("MicroagentManagement", () => {
const user = userEvent.setup();
// Mock the content API to return empty content for this test
- vi.spyOn(OpenHands, "getRepositoryMicroagentContent").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryMicroagentContent").mockResolvedValue({
content: "",
path: ".openhands/microagents/update-test-microagent",
git_provider: "github",
@@ -2363,7 +2364,7 @@ describe("MicroagentManagement", () => {
const user = userEvent.setup();
// Mock the content API to return content without triggers for this test
- vi.spyOn(OpenHands, "getRepositoryMicroagentContent").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryMicroagentContent").mockResolvedValue({
content: "Original microagent content for testing updates",
path: ".openhands/microagents/update-test-microagent",
git_provider: "github",
@@ -2647,7 +2648,7 @@ describe("MicroagentManagement", () => {
const user = userEvent.setup();
// Mock the content API to return the expected content for this test
- vi.spyOn(OpenHands, "getRepositoryMicroagentContent").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryMicroagentContent").mockResolvedValue({
content: "Test microagent content for learn functionality",
path: ".openhands/microagents/learn-test-microagent",
git_provider: "github",
@@ -2707,7 +2708,7 @@ describe("MicroagentManagement", () => {
const user = userEvent.setup();
// Mock the content API to return empty content for this test
- vi.spyOn(OpenHands, "getRepositoryMicroagentContent").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryMicroagentContent").mockResolvedValue({
content: "",
path: ".openhands/microagents/learn-test-microagent",
git_provider: "github",
@@ -2765,7 +2766,7 @@ describe("MicroagentManagement", () => {
const user = userEvent.setup();
// Mock the content API to return content without triggers for this test
- vi.spyOn(OpenHands, "getRepositoryMicroagentContent").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryMicroagentContent").mockResolvedValue({
content: "Test microagent content for learn functionality",
path: ".openhands/microagents/learn-test-microagent",
git_provider: "github",
diff --git a/frontend/__tests__/routes/home-screen.test.tsx b/frontend/__tests__/routes/home-screen.test.tsx
index ad5b1fba52..924af1401d 100644
--- a/frontend/__tests__/routes/home-screen.test.tsx
+++ b/frontend/__tests__/routes/home-screen.test.tsx
@@ -8,7 +8,7 @@ import { createAxiosNotFoundErrorObject, setupStore } from "test-utils";
import HomeScreen from "#/routes/home";
import { GitRepository } from "#/types/git";
import SettingsService from "#/settings-service/settings-service.api";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import OptionService from "#/api/option-service/option-service.api";
import MainApp from "#/routes/root-layout";
import { MOCK_DEFAULT_USER_SETTINGS } from "#/mocks/handlers";
@@ -141,7 +141,7 @@ describe("HomeScreen", () => {
it("should filter the suggested tasks based on the selected repository", async () => {
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -150,7 +150,7 @@ describe("HomeScreen", () => {
});
// Mock the repository branches API call
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [
{ name: "main", commit_sha: "123", protected: false },
{ name: "develop", commit_sha: "456", protected: false },
@@ -185,7 +185,7 @@ describe("HomeScreen", () => {
it("should filter tasks when different repositories are selected", async () => {
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
@@ -194,7 +194,7 @@ describe("HomeScreen", () => {
});
// Mock the repository branches API call
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [
{ name: "main", commit_sha: "123", protected: false },
{ name: "develop", commit_sha: "456", protected: false },
@@ -248,7 +248,7 @@ describe("HomeScreen", () => {
await screen.findAllByTestId("task-launch-button");
// Mock the repository branches API call
- vi.spyOn(OpenHands, "getRepositoryBranches").mockResolvedValue({
+ vi.spyOn(GitService, "getRepositoryBranches").mockResolvedValue({
branches: [
{ name: "main", commit_sha: "123", protected: false },
{ name: "develop", commit_sha: "456", protected: false },
@@ -284,7 +284,7 @@ describe("HomeScreen", () => {
beforeEach(() => {
const retrieveUserGitRepositoriesSpy = vi.spyOn(
- OpenHands,
+ GitService,
"retrieveUserGitRepositories",
);
retrieveUserGitRepositoriesSpy.mockResolvedValue({
diff --git a/frontend/src/api/git-service/git-service.api.ts b/frontend/src/api/git-service/git-service.api.ts
new file mode 100644
index 0000000000..e175dd8fbe
--- /dev/null
+++ b/frontend/src/api/git-service/git-service.api.ts
@@ -0,0 +1,215 @@
+import { openHands } from "../open-hands-axios";
+import { Provider } from "#/types/settings";
+import { GitRepository, PaginatedBranchesResponse, Branch } from "#/types/git";
+import { extractNextPageFromLink } from "#/utils/extract-next-page-from-link";
+import { RepositoryMicroagent } from "#/types/microagent-management";
+import { MicroagentContentResponse } from "../open-hands.types";
+
+/**
+ * Git Service API - Handles all Git-related API endpoints
+ */
+class GitService {
+ /**
+ * Search for Git repositories
+ * @param query Search query
+ * @param per_page Number of results per page
+ * @param selected_provider Git provider to search in
+ * @returns List of matching repositories
+ */
+ static async searchGitRepositories(
+ query: string,
+ per_page = 5,
+ selected_provider?: Provider,
+ ): Promise<GitRepository[]> {
+ const response = await openHands.get<GitRepository[]>(
+ "/api/user/search/repositories",
+ {
+ params: {
+ query,
+ per_page,
+ selected_provider,
+ },
+ },
+ );
+
+ return response.data;
+ }
+
+ /**
+ * Retrieve user's Git repositories
+ * @param selected_provider Git provider
+ * @param page Page number
+ * @param per_page Number of results per page
+ * @returns User's repositories with pagination info
+ */
+ static async retrieveUserGitRepositories(
+ selected_provider: Provider,
+ page = 1,
+ per_page = 30,
+ ) {
+ const { data } = await openHands.get<GitRepository[]>(
+ "/api/user/repositories",
+ {
+ params: {
+ selected_provider,
+ sort: "pushed",
+ page,
+ per_page,
+ },
+ },
+ );
+
+ const link =
+ data.length > 0 && data[0].link_header ? data[0].link_header : "";
+ const nextPage = extractNextPageFromLink(link);
+
+ return { data, nextPage };
+ }
+
+ /**
+ * Retrieve repositories from a specific installation
+ * @param selected_provider Git provider
+ * @param installationIndex Current installation index
+ * @param installations List of installation IDs
+ * @param page Page number
+ * @param per_page Number of results per page
+ * @returns Installation repositories with pagination info
+ */
+ static async retrieveInstallationRepositories(
+ selected_provider: Provider,
+ installationIndex: number,
+ installations: string[],
+ page = 1,
+ per_page = 30,
+ ) {
+ const installationId = installations[installationIndex];
+ const response = await openHands.get<GitRepository[]>(
+ "/api/user/repositories",
+ {
+ params: {
+ selected_provider,
+ sort: "pushed",
+ page,
+ per_page,
+ installation_id: installationId,
+ },
+ },
+ );
+ const link =
+ response.data.length > 0 && response.data[0].link_header
+ ? response.data[0].link_header
+ : "";
+ const nextPage = extractNextPageFromLink(link);
+ let nextInstallation: number | null;
+ if (nextPage) {
+ nextInstallation = installationIndex;
+ } else if (installationIndex + 1 < installations.length) {
+ nextInstallation = installationIndex + 1;
+ } else {
+ nextInstallation = null;
+ }
+ return {
+ data: response.data,
+ nextPage,
+ installationIndex: nextInstallation,
+ };
+ }
+
+ /**
+ * Get repository branches
+ * @param repository Repository name
+ * @param page Page number
+ * @param perPage Number of results per page
+ * @returns Paginated branches response
+ */
+ static async getRepositoryBranches(
+ repository: string,
+ page: number = 1,
+ perPage: number = 30,
+ ): Promise<PaginatedBranchesResponse> {
+ const { data } = await openHands.get<PaginatedBranchesResponse>(
+ `/api/user/repository/branches?repository=${encodeURIComponent(repository)}&page=${page}&per_page=${perPage}`,
+ );
+
+ return data;
+ }
+
+ /**
+ * Search repository branches
+ * @param repository Repository name
+ * @param query Search query
+ * @param perPage Number of results per page
+ * @param selectedProvider Git provider
+ * @returns List of matching branches
+ */
+ static async searchRepositoryBranches(
+ repository: string,
+ query: string,
+ perPage: number = 30,
+ selectedProvider?: Provider,
+ ): Promise<Branch[]> {
+ const { data } = await openHands.get<Branch[]>(
+ `/api/user/search/branches`,
+ {
+ params: {
+ repository,
+ query,
+ per_page: perPage,
+ selected_provider: selectedProvider,
+ },
+ },
+ );
+ return data;
+ }
+
+ /**
+ * Get the available microagents for a repository
+ * @param owner The repository owner
+ * @param repo The repository name
+ * @returns The available microagents for the repository
+ */
+ static async getRepositoryMicroagents(
+ owner: string,
+ repo: string,
+ ): Promise<RepositoryMicroagent[]> {
+ const { data } = await openHands.get<RepositoryMicroagent[]>(
+ `/api/user/repository/${owner}/${repo}/microagents`,
+ );
+ return data;
+ }
+
+ /**
+ * Get the content of a specific microagent from a repository
+ * @param owner The repository owner
+ * @param repo The repository name
+ * @param filePath The path to the microagent file within the repository
+ * @returns The microagent content and metadata
+ */
+ static async getRepositoryMicroagentContent(
+ owner: string,
+ repo: string,
+ filePath: string,
+ ): Promise<MicroagentContentResponse> {
+ const { data } = await openHands.get<MicroagentContentResponse>(
+ `/api/user/repository/${owner}/${repo}/microagents/content`,
+ {
+ params: { file_path: filePath },
+ },
+ );
+ return data;
+ }
+
+ /**
+ * Get the user installation IDs
+ * @param provider The provider to get installation IDs for (github, bitbucket, etc.)
+ * @returns List of installation IDs
+ */
+ static async getUserInstallationIds(provider: Provider): Promise<string[]> {
+ const { data } = await openHands.get<string[]>(
+ `/api/user/installations?provider=${provider}`,
+ );
+ return data;
+ }
+}
+
+export default GitService;
diff --git a/frontend/src/api/open-hands.ts b/frontend/src/api/open-hands.ts
index f5edaed421..b8c963f58e 100644
--- a/frontend/src/api/open-hands.ts
+++ b/frontend/src/api/open-hands.ts
@@ -11,7 +11,6 @@ import {
GetMicroagentsResponse,
GetMicroagentPromptResponse,
CreateMicroagent,
- MicroagentContentResponse,
FileUploadSuccessResponse,
GetFilesResponse,
GetFileResponse,
@@ -19,14 +18,6 @@ import {
import { openHands } from "./open-hands-axios";
import { Provider } from "#/types/settings";
import { SuggestedTask } from "#/utils/types";
-import {
- GitUser,
- GitRepository,
- PaginatedBranchesResponse,
- Branch,
-} from "#/types/git";
-import { extractNextPageFromLink } from "#/utils/extract-next-page-from-link";
-import { RepositoryMicroagent } from "#/types/microagent-management";
import { BatchFeedbackData } from "#/hooks/query/use-batch-feedback";
import { SubscriptionAccess } from "#/types/billing";
@@ -353,42 +344,6 @@ class OpenHands {
return data;
}
- static async getGitUser(): Promise<GitUser> {
- const response = await openHands.get<GitUser>("/api/user/info");
-
- const { data } = response;
-
- const user: GitUser = {
- id: data.id,
- login: data.login,
- avatar_url: data.avatar_url,
- company: data.company,
- name: data.name,
- email: data.email,
- };
-
- return user;
- }
-
- static async searchGitRepositories(
- query: string,
- per_page = 5,
- selected_provider?: Provider,
- ): Promise<GitRepository[]> {
- const response = await openHands.get<GitRepository[]>(
- "/api/user/search/repositories",
- {
- params: {
- query,
- per_page,
- selected_provider,
- },
- },
- );
-
- return response.data;
- }
-
static async getTrajectory(
conversationId: string,
): Promise<GetTrajectoryResponse> {
@@ -422,101 +377,6 @@ class OpenHands {
/**
* @returns A list of repositories
*/
- static async retrieveUserGitRepositories(
- selected_provider: Provider,
- page = 1,
- per_page = 30,
- ) {
- const { data } = await openHands.get<GitRepository[]>(
- "/api/user/repositories",
- {
- params: {
- selected_provider,
- sort: "pushed",
- page,
- per_page,
- },
- },
- );
-
- const link =
- data.length > 0 && data[0].link_header ? data[0].link_header : "";
- const nextPage = extractNextPageFromLink(link);
-
- return { data, nextPage };
- }
-
- static async retrieveInstallationRepositories(
- selected_provider: Provider,
- installationIndex: number,
- installations: string[],
- page = 1,
- per_page = 30,
- ) {
- const installationId = installations[installationIndex];
- const response = await openHands.get<GitRepository[]>(
- "/api/user/repositories",
- {
- params: {
- selected_provider,
- sort: "pushed",
- page,
- per_page,
- installation_id: installationId,
- },
- },
- );
- const link =
- response.data.length > 0 && response.data[0].link_header
- ? response.data[0].link_header
- : "";
- const nextPage = extractNextPageFromLink(link);
- let nextInstallation: number | null;
- if (nextPage) {
- nextInstallation = installationIndex;
- } else if (installationIndex + 1 < installations.length) {
- nextInstallation = installationIndex + 1;
- } else {
- nextInstallation = null;
- }
- return {
- data: response.data,
- nextPage,
- installationIndex: nextInstallation,
- };
- }
-
- static async getRepositoryBranches(
- repository: string,
- page: number = 1,
- perPage: number = 30,
- ): Promise<PaginatedBranchesResponse> {
- const { data } = await openHands.get<PaginatedBranchesResponse>(
- `/api/user/repository/branches?repository=${encodeURIComponent(repository)}&page=${page}&per_page=${perPage}`,
- );
-
- return data;
- }
-
- static async searchRepositoryBranches(
- repository: string,
- query: string,
- perPage: number = 30,
- selectedProvider?: Provider,
- ): Promise<Branch[]> {
- const { data } = await openHands.get<Branch[]>(
- `/api/user/search/branches`,
- {
- params: {
- repository,
- query,
- per_page: perPage,
- selected_provider: selectedProvider,
- },
- },
- );
- return data;
- }
/**
* Get the available microagents associated with a conversation
@@ -539,15 +399,6 @@ class OpenHands {
* @param repo The repository name
* @returns The available microagents for the repository
*/
- static async getRepositoryMicroagents(
- owner: string,
- repo: string,
- ): Promise<RepositoryMicroagent[]> {
- const { data } = await openHands.get<RepositoryMicroagent[]>(
- `/api/user/repository/${owner}/${repo}/microagents`,
- );
- return data;
- }
/**
* Get the content of a specific microagent from a repository
@@ -556,19 +407,6 @@ class OpenHands {
* @param filePath The path to the microagent file within the repository
* @returns The microagent content and metadata
*/
- static async getRepositoryMicroagentContent(
- owner: string,
- repo: string,
- filePath: string,
- ): Promise<MicroagentContentResponse> {
- const { data } = await openHands.get<MicroagentContentResponse>(
- `/api/user/repository/${owner}/${repo}/microagents/content`,
- {
- params: { file_path: filePath },
- },
- );
- return data;
- }
static async getMicroagentPrompt(
conversationId: string,
@@ -657,18 +495,6 @@ class OpenHands {
);
return response.data;
}
-
- /**
- * Get the user installation IDs
- * @param provider The provider to get installation IDs for (github, bitbucket, etc.)
- * @returns List of installation IDs
- */
- static async getUserInstallationIds(provider: Provider): Promise<string[]> {
- const { data } = await openHands.get<string[]>(
- `/api/user/installations?provider=${provider}`,
- );
- return data;
- }
}
export default OpenHands;
diff --git a/frontend/src/api/user-service/user-service.api.ts b/frontend/src/api/user-service/user-service.api.ts
new file mode 100644
index 0000000000..1372fc8db8
--- /dev/null
+++ b/frontend/src/api/user-service/user-service.api.ts
@@ -0,0 +1,30 @@
+import { openHands } from "../open-hands-axios";
+import { GitUser } from "#/types/git";
+
+/**
+ * User Service API - Handles all user-related API endpoints
+ */
+class UserService {
+ /**
+ * Get the current user's Git information
+ * @returns Git user information
+ */
+ static async getUser(): Promise<GitUser> {
+ const response = await openHands.get<GitUser>("/api/user/info");
+
+ const { data } = response;
+
+ const user: GitUser = {
+ id: data.id,
+ login: data.login,
+ avatar_url: data.avatar_url,
+ company: data.company,
+ name: data.name,
+ email: data.email,
+ };
+
+ return user;
+ }
+}
+
+export default UserService;
diff --git a/frontend/src/components/features/home/git-repo-dropdown/use-url-search.tsx b/frontend/src/components/features/home/git-repo-dropdown/use-url-search.tsx
index 82cb6d27f2..c6c6159f52 100644
--- a/frontend/src/components/features/home/git-repo-dropdown/use-url-search.tsx
+++ b/frontend/src/components/features/home/git-repo-dropdown/use-url-search.tsx
@@ -1,7 +1,7 @@
import { useState, useEffect } from "react";
import { Provider } from "#/types/settings";
import { GitRepository } from "#/types/git";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
export function useUrlSearch(inputValue: string, provider: Provider) {
const [urlSearchResults, setUrlSearchResults] = useState<GitRepository[]>([]);
@@ -16,7 +16,7 @@ export function useUrlSearch(inputValue: string, provider: Provider) {
setIsUrlSearchLoading(true);
try {
- const repositories = await OpenHands.searchGitRepositories(
+ const repositories = await GitService.searchGitRepositories(
repoName,
3,
provider,
diff --git a/frontend/src/hooks/query/use-app-installations.ts b/frontend/src/hooks/query/use-app-installations.ts
index fc007cce77..85eee75909 100644
--- a/frontend/src/hooks/query/use-app-installations.ts
+++ b/frontend/src/hooks/query/use-app-installations.ts
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
import { useConfig } from "./use-config";
import { useIsAuthed } from "./use-is-authed";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { useUserProviders } from "../use-user-providers";
import { Provider } from "#/types/settings";
import { shouldUseInstallationRepos } from "#/utils/utils";
@@ -13,7 +13,7 @@ export const useAppInstallations = (selectedProvider: Provider | null) => {
return useQuery({
queryKey: ["installations", providers || [], selectedProvider],
- queryFn: () => OpenHands.getUserInstallationIds(selectedProvider!),
+ queryFn: () => GitService.getUserInstallationIds(selectedProvider!),
enabled:
userIsAuthenticated &&
!!selectedProvider &&
diff --git a/frontend/src/hooks/query/use-git-repositories.ts b/frontend/src/hooks/query/use-git-repositories.ts
index 17319cde10..cdfb48bea9 100644
--- a/frontend/src/hooks/query/use-git-repositories.ts
+++ b/frontend/src/hooks/query/use-git-repositories.ts
@@ -4,7 +4,7 @@ import { useUserProviders } from "../use-user-providers";
import { useAppInstallations } from "./use-app-installations";
import { GitRepository } from "../../types/git";
import { Provider } from "../../types/settings";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { shouldUseInstallationRepos } from "#/utils/utils";
interface UseGitRepositoriesOptions {
@@ -60,7 +60,7 @@ export function useGitRepositories(options: UseGitRepositoriesOptions) {
throw new Error("Missing installation list");
}
- return OpenHands.retrieveInstallationRepositories(
+ return GitService.retrieveInstallationRepositories(
provider,
installationIndex || 0,
installations,
@@ -69,7 +69,7 @@ export function useGitRepositories(options: UseGitRepositoriesOptions) {
);
}
- return OpenHands.retrieveUserGitRepositories(
+ return GitService.retrieveUserGitRepositories(
provider,
pageParam as number,
pageSize,
diff --git a/frontend/src/hooks/query/use-git-user.ts b/frontend/src/hooks/query/use-git-user.ts
index b4de5b4bf0..916088ae12 100644
--- a/frontend/src/hooks/query/use-git-user.ts
+++ b/frontend/src/hooks/query/use-git-user.ts
@@ -2,7 +2,7 @@ import { useQuery } from "@tanstack/react-query";
import React from "react";
import posthog from "posthog-js";
import { useConfig } from "./use-config";
-import OpenHands from "#/api/open-hands";
+import UserService from "#/api/user-service/user-service.api";
import { useShouldShowUserFeatures } from "#/hooks/use-should-show-user-features";
export const useGitUser = () => {
@@ -13,7 +13,7 @@ export const useGitUser = () => {
const user = useQuery({
queryKey: ["user"],
- queryFn: OpenHands.getGitUser,
+ queryFn: UserService.getUser,
enabled: shouldFetchUser,
retry: false,
staleTime: 1000 * 60 * 5, // 5 minutes
diff --git a/frontend/src/hooks/query/use-installation-repositories.ts b/frontend/src/hooks/query/use-installation-repositories.ts
index cc1ff50da0..32a9f92fc4 100644
--- a/frontend/src/hooks/query/use-installation-repositories.ts
+++ b/frontend/src/hooks/query/use-installation-repositories.ts
@@ -3,7 +3,7 @@ import { useAppInstallations } from "./use-app-installations";
import { useConfig } from "./use-config";
import { useUserProviders } from "../use-user-providers";
import { Provider } from "#/types/settings";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { shouldUseInstallationRepos } from "#/utils/utils";
export const useInstallationRepositories = (
@@ -31,7 +31,7 @@ export const useInstallationRepositories = (
throw new Error("Missing installation list");
}
- return OpenHands.retrieveInstallationRepositories(
+ return GitService.retrieveInstallationRepositories(
selectedProvider!,
installationIndex || 0,
installations,
diff --git a/frontend/src/hooks/query/use-repository-branches.ts b/frontend/src/hooks/query/use-repository-branches.ts
index de78556fc4..2a1ba39775 100644
--- a/frontend/src/hooks/query/use-repository-branches.ts
+++ b/frontend/src/hooks/query/use-repository-branches.ts
@@ -1,5 +1,5 @@
import { useQuery, useInfiniteQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { Branch, PaginatedBranchesResponse } from "#/types/git";
export const useRepositoryBranches = (repository: string | null) =>
@@ -7,7 +7,7 @@ export const useRepositoryBranches = (repository: string | null) =>
queryKey: ["repository", repository, "branches"],
queryFn: async () => {
if (!repository) return [];
- const response = await OpenHands.getRepositoryBranches(repository);
+ const response = await GitService.getRepositoryBranches(repository);
// Ensure we return an array even if the response is malformed
return Array.isArray(response.branches) ? response.branches : [];
},
@@ -31,7 +31,7 @@ export const useRepositoryBranchesPaginated = (
total_count: 0,
};
}
- return OpenHands.getRepositoryBranches(
+ return GitService.getRepositoryBranches(
repository,
pageParam as number,
perPage,
diff --git a/frontend/src/hooks/query/use-repository-microagent-content.ts b/frontend/src/hooks/query/use-repository-microagent-content.ts
index 4b1979ce62..dd4bfc8e8a 100644
--- a/frontend/src/hooks/query/use-repository-microagent-content.ts
+++ b/frontend/src/hooks/query/use-repository-microagent-content.ts
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
export const useRepositoryMicroagentContent = (
owner: string,
@@ -10,7 +10,7 @@ export const useRepositoryMicroagentContent = (
useQuery({
queryKey: ["repository", "microagent", "content", owner, repo, filePath],
queryFn: () =>
- OpenHands.getRepositoryMicroagentContent(owner, repo, filePath),
+ GitService.getRepositoryMicroagentContent(owner, repo, filePath),
enabled: !!owner && !!repo && !!filePath,
staleTime: cacheDisabled ? 0 : 1000 * 60 * 5, // 5 minutes
gcTime: cacheDisabled ? 0 : 1000 * 60 * 15, // 15 minutes
diff --git a/frontend/src/hooks/query/use-repository-microagents.ts b/frontend/src/hooks/query/use-repository-microagents.ts
index fb1c95f28f..9626d955e3 100644
--- a/frontend/src/hooks/query/use-repository-microagents.ts
+++ b/frontend/src/hooks/query/use-repository-microagents.ts
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
export const useRepositoryMicroagents = (
owner: string,
@@ -8,7 +8,7 @@ export const useRepositoryMicroagents = (
) =>
useQuery({
queryKey: ["repository", "microagents", owner, repo],
- queryFn: () => OpenHands.getRepositoryMicroagents(owner, repo),
+ queryFn: () => GitService.getRepositoryMicroagents(owner, repo),
enabled: !!owner && !!repo,
staleTime: cacheDisabled ? 0 : 1000 * 60 * 5, // 5 minutes
gcTime: cacheDisabled ? 0 : 1000 * 60 * 15, // 15 minutes
diff --git a/frontend/src/hooks/query/use-search-branches.ts b/frontend/src/hooks/query/use-search-branches.ts
index b2ce4af078..73b94dc56f 100644
--- a/frontend/src/hooks/query/use-search-branches.ts
+++ b/frontend/src/hooks/query/use-search-branches.ts
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { Branch } from "#/types/git";
import { Provider } from "#/types/settings";
@@ -21,7 +21,7 @@ export function useSearchBranches(
],
queryFn: async () => {
if (!repository || !query) return [];
- return OpenHands.searchRepositoryBranches(
+ return GitService.searchRepositoryBranches(
repository,
query,
perPage,
diff --git a/frontend/src/hooks/query/use-search-repositories.ts b/frontend/src/hooks/query/use-search-repositories.ts
index 49cd1a2e07..c3cefbd0fc 100644
--- a/frontend/src/hooks/query/use-search-repositories.ts
+++ b/frontend/src/hooks/query/use-search-repositories.ts
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { Provider } from "#/types/settings";
export function useSearchRepositories(
@@ -11,7 +11,7 @@ export function useSearchRepositories(
return useQuery({
queryKey: ["repositories", "search", query, selectedProvider, pageSize],
queryFn: () =>
- OpenHands.searchGitRepositories(
+ GitService.searchGitRepositories(
query,
pageSize,
selectedProvider || undefined,
diff --git a/frontend/src/hooks/query/use-user-repositories.ts b/frontend/src/hooks/query/use-user-repositories.ts
index 5ebca842d8..ac647c0cf7 100644
--- a/frontend/src/hooks/query/use-user-repositories.ts
+++ b/frontend/src/hooks/query/use-user-repositories.ts
@@ -2,7 +2,7 @@ import { useInfiniteQuery } from "@tanstack/react-query";
import { useConfig } from "./use-config";
import { useUserProviders } from "../use-user-providers";
import { Provider } from "#/types/settings";
-import OpenHands from "#/api/open-hands";
+import GitService from "#/api/git-service/git-service.api";
import { shouldUseInstallationRepos } from "#/utils/utils";
export const useUserRepositories = (selectedProvider: Provider | null) => {
@@ -12,7 +12,7 @@ export const useUserRepositories = (selectedProvider: Provider | null) => {
const repos = useInfiniteQuery({
queryKey: ["repositories", providers || [], selectedProvider],
queryFn: async ({ pageParam }) =>
- OpenHands.retrieveUserGitRepositories(selectedProvider!, pageParam, 30),
+ GitService.retrieveUserGitRepositories(selectedProvider!, pageParam, 30),
initialPageParam: 1,
getNextPageParam: (lastPage) => lastPage.nextPage,
enabled: