Skip to content

Add a default server config for non-source nodes.#2035

Merged
jlhester merged 2 commits intomainfrom
1913-default-server
Apr 24, 2026
Merged

Add a default server config for non-source nodes.#2035
jlhester merged 2 commits intomainfrom
1913-default-server

Conversation

@jlhester
Copy link
Copy Markdown
Collaborator

Summary

Test Plan

  • PR has an associated issue: #
  • make check passes
  • make test shows 100% unit test coverage

Deployment Plan

@netlify
Copy link
Copy Markdown

netlify Bot commented Apr 20, 2026

Deploy Preview for thriving-cassata-78ae72 canceled.

Name Link
🔨 Latest commit 2b47c33
🔍 Latest deploy log https://app.netlify.com/projects/thriving-cassata-78ae72/deploys/69eb81bdac17aa0008feb74d

@jlhester jlhester force-pushed the 1913-default-server branch from 697af5b to 9a48408 Compare April 20, 2026 21:24
@jlhester jlhester linked an issue Apr 21, 2026 that may be closed by this pull request
@jlhester jlhester force-pushed the 1913-default-server branch 2 times, most recently from e869335 to 2db1392 Compare April 21, 2026 17:35
@jlhester jlhester marked this pull request as ready for review April 21, 2026 18:29
@jlhester jlhester requested a review from shangyian April 21, 2026 19:02
return self.registry.catalogs.get(self.deployment_spec.default_catalog)
settings = get_settings()
if settings.seed_setup.default_catalog_name:
return self.registry.catalogs.get(settings.seed_setup.default_catalog_name)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should we make sure that the registry always loads up the default catalog in the catalogs bulk load?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

When you say "loads up", do you mean actually create the default catalog if it doesn't exist, or just check if it exists during the bulk load?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant just check if it exists during bulk load. I think an explicit creation step is probably cleaner than just auto-creating.

if catalogs:
new_revision.catalog_id = catalogs[0]
else:
default_catalog = await Catalog.get_default_catalog(session)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should this use the same pattern as above (lines 542-547), i.e., "use the default catalog or fallback to virtual catalog"?

@jlhester jlhester force-pushed the 1913-default-server branch from ca2e9a3 to 3e93226 Compare April 23, 2026 15:27
Copy link
Copy Markdown
Collaborator

@shangyian shangyian left a comment

Choose a reason for hiding this comment

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

LGTM, 🚢

@jlhester jlhester force-pushed the 1913-default-server branch from 3e93226 to 2b47c33 Compare April 24, 2026 14:44
@jlhester
Copy link
Copy Markdown
Collaborator Author

One of the tests failed initially with a sqlalchemy distinct key conflict, but rerunning fixed it 😬. If it pops up again I'll capture it in a ticket.

@jlhester jlhester merged commit 1253502 into main Apr 24, 2026
44 of 45 checks passed
@jlhester jlhester deleted the 1913-default-server branch April 24, 2026 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Server-Configured Default Catalog

2 participants