Skip to content

sgr cloud load/dump fixes #520

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

Merged
mildbyte merged 2 commits into from
Aug 18, 2021
Merged

sgr cloud load/dump fixes #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dfa862
Fix a cloud GQL api change for `repoTopicsByNamespaceAndRepository` (…
mildbyte Aug 18, 2021
546006d
Delete the old workaround for the case where `createRepoTopicsAgg` do…
mildbyte Aug 18, 2021
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: 1 addition & 14 deletions splitgraph/cloud/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def get_headers():
repository
repoTopicsByNamespaceAndRepository {
nodes {
topics
topic
}
}
repoProfileByNamespaceAndRepository {
Expand Down Expand Up @@ -756,19 +756,6 @@ def upsert_metadata(self, namespace: str, repository: str, metadata: Metadata):
Update metadata for a single repository.
"""
response = self._gql(self._prepare_upsert_metadata_gql(namespace, repository, metadata))
if (
response.status_code == 400
and 'Cannot query field \\"createRepoTopicsAgg\\" on type \\"Mutation\\"'
in response.text
):
# TODO: hack, delete when all upgraded.
# We don't yet have API versioning on the GQL side and there's a breaking change
# coming that'll rename createRepoTopic to createRepoTopicsAgg. If there's
# an error calling the latter, rewrite the query to call the former instead.
logging.debug("Using old metadata replacement query")
response = self._gql(
self._prepare_upsert_metadata_gql(namespace, repository, metadata, v1=True)
)
return response

def bulk_upsert_metadata(
Expand Down
6 changes: 2 additions & 4 deletions splitgraph/cloud/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class RepositoriesYAML(BaseModel):
class MetadataResponse(BaseModel):
class RepoTopicsResponse(BaseModel):
class RepositoryTopics(BaseModel):
topics: List[str]
topic: str

nodes: List[RepositoryTopics]

Expand Down Expand Up @@ -116,9 +116,7 @@ def to_metadata(self) -> Metadata:
return Metadata(
readme=Metadata.Readme(text=profile.readme),
description=profile.description,
topics=[
t for node in self.repoTopicsByNamespaceAndRepository.nodes for t in node.topics
],
topics=[node.topic for node in self.repoTopicsByNamespaceAndRepository.nodes],
sources=profile.sources,
license=profile.license,
extra_metadata=profile.metadata.upstream_metadata if profile.metadata else None,
Expand Down
4 changes: 3 additions & 1 deletion test/splitgraph/commandline/http_fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,9 @@ def _gql_callback(request, uri, response_headers):
_somerepo_2 = {
"namespace": "otheruser",
"repository": "somerepo_2",
"repoTopicsByNamespaceAndRepository": {"nodes": [{"topics": ["topic_1", "topic_2"]}]},
"repoTopicsByNamespaceAndRepository": {
"nodes": [{"topic": "topic_1"}, {"topic": "topic_2"}]
},
"repoProfileByNamespaceAndRepository": {
"description": "Repository Description 2",
"license": None,
Expand Down