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

[KWSearch] Double Confluence parent IDs #9274

Merged
merged 9 commits into from
Dec 12, 2024
Merged

[KWSearch] Double Confluence parent IDs #9274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f2e83b
upsert both the old and new parents for confluence pages
aubin-tchoi Dec 11, 2024
7e573c9
add migration script
aubin-tchoi Dec 11, 2024
b88935e
fix borrow errors
aubin-tchoi Dec 11, 2024
bb83a10
fix borrow errors
aubin-tchoi Dec 11, 2024
82ec3f4
clone the qdrant_clients for concurrent use
aubin-tchoi Dec 11, 2024
7df4d82
pass store as a ref
aubin-tchoi Dec 11, 2024
1134b2b
clone instead of passing refs for the store
aubin-tchoi Dec 11, 2024
1650304
remove migration script for confluence
aubin-tchoi Dec 11, 2024
de1a902
fix: make the upsert consistent with the updateDocumentParents
aubin-tchoi Dec 11, 2024
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
15 changes: 15 additions & 0 deletions connectors/src/connectors/confluence/lib/internal_ids.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
import {
makeConfluencePageId,
makeConfluenceSpaceId,
} from "@connectors/connectors/confluence/temporal/utils";

enum ConfluenceInternalIdPrefix {
Space = "cspace_",
Page = "cpage_",
Expand Down Expand Up @@ -27,3 +32,13 @@ export function isConfluenceInternalPageId(
): internalId is `${ConfluenceInternalIdPrefix.Page}${string}` {
return internalId.startsWith(ConfluenceInternalIdPrefix.Page);
}

export function convertInternalIdToDocumentId(internalId: string): string {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the intent to merge the functions after the internal id is removed? (aka delete getId fns)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this is the plan, I think we can do it after all the doubling up and migrating is done

if (isConfluenceInternalPageId(internalId)) {
return makeConfluencePageId(getIdFromConfluenceInternalId(internalId));
}
if (isConfluenceInternalSpaceId(internalId)) {
return makeConfluenceSpaceId(getIdFromConfluenceInternalId(internalId));
}
throw new Error(`Invalid internal ID: ${internalId}`);
}
14 changes: 11 additions & 3 deletions connectors/src/connectors/confluence/temporal/activities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ import {
getConfluencePageParentIds,
getSpaceHierarchy,
} from "@connectors/connectors/confluence/lib/hierarchy";
import { makeConfluenceInternalPageId } from "@connectors/connectors/confluence/lib/internal_ids";
import {
convertInternalIdToDocumentId,
makeConfluenceInternalPageId,
} from "@connectors/connectors/confluence/lib/internal_ids";
import {
makeConfluenceDocumentUrl,
makeConfluencePageId,
Expand Down Expand Up @@ -384,7 +387,8 @@ export async function confluenceCheckAndUpsertPageActivity({
documentUrl,
loggerArgs,
// Parent Ids will be computed after all page imports within the space have been completed.
parents: [makeConfluenceInternalPageId(documentId)],
// TODO(2024-12-11 aubin): we upsert parents x2 (old and new), this is the first step of the backfill plan
parents: [documentId, makeConfluenceInternalPageId(pageId)],
tags,
timestampMs: lastPageVersionCreatedAt.getTime(),
upsertContext: {
Expand Down Expand Up @@ -572,7 +576,11 @@ export async function confluenceUpdatePagesParentIdsActivity(
await updateDocumentParentsField({
dataSourceConfig: dataSourceConfigFromConnector(connector),
documentId: makeConfluencePageId(page.pageId),
parents: parentIds,
// TODO(2024-12-11 aubin): we upsert parents x2 (old and new), this is the first step of the backfill plan
parents: [
...parentIds,
...parentIds.map(convertInternalIdToDocumentId),
],
});
},
{ concurrency: 10 }
Expand Down
4 changes: 4 additions & 0 deletions connectors/src/connectors/confluence/temporal/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ export function makeConfluencePageId(pageId: string) {
return `confluence-page-${pageId}`;
}

export function makeConfluenceSpaceId(spaceId: string) {
return `confluence-space-${spaceId}`;
}

export function makeConfluenceDocumentUrl({
baseUrl,
suffix,
Expand Down
Loading