Merge pull request #606 from splitgraph/feature/sgr-cloud-seed-changes

mildbyte · web-flow · commit c1d833947d32 · 2022-01-06T12:46:15.000Z
Feature/sgr cloud seed changes
diff --git a/splitgraph/cloud/__init__.py b/splitgraph/cloud/__init__.py
@@ -948,9 +948,9 @@ def _make_plugin(plugin_dict: Dict[str, Any]) -> Plugin:
             supports_mount=plugin_dict["supportsMount"],
         )
 
-    def get_all_plugins(self) -> List[Plugin]:
+    def get_all_plugins(self, seed: Optional[str] = None) -> List[Plugin]:
         response = self._gql(
-            {"query": GET_PLUGINS, "operationName": "ExternalPlugins"},
+            {"query": GET_PLUGINS, "operationName": "ExternalPlugins", "variables": {"seed": seed}},
             handle_errors=True,
             anonymous_ok=True,
         )
diff --git a/splitgraph/cloud/project/generation.py b/splitgraph/cloud/project/generation.py
@@ -1,12 +1,14 @@
 import base64
 import itertools
 import os
+import random
+import string
 from io import StringIO
 from pathlib import Path
 from typing import Any, Dict, List, Mapping, Optional, Tuple
 
 import ruamel.yaml
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 from ruamel.yaml import CommentedMap as CM
 from ruamel.yaml import CommentedSeq as CS
 
@@ -143,12 +145,20 @@ def stub_plugin(plugin: Plugin, namespace: str, repository: str, is_live: bool =
     return ruamel_dict
 
 
+def _get_seed_uid() -> str:
+    return "".join(
+        random.choice(string.ascii_lowercase + string.ascii_uppercase + string.digits)
+        for _ in range(10)
+    )
+
+
 class ProjectSeed(BaseModel):
     """
     Contains all information required to generate a Splitgraph project + optionally
     a dbt model for GitHub Actions
     """
 
+    seed_uid: str = Field(default_factory=_get_seed_uid)
     namespace: str
     plugins: List[str]
     include_dbt: bool = False
@@ -162,11 +172,12 @@ def decode(cls, encoded: str) -> "ProjectSeed":
 
 
 def generate_project(
-    api_client: GQLAPIClient, seed: ProjectSeed, basedir: Path, github_repo: Optional[str] = None
+    api_client: GQLAPIClient, seed: str, basedir: Path, github_repo: Optional[str] = None
 ) -> None:
-    all_plugins = {p.plugin_name: p for p in api_client.get_all_plugins()}
+    all_plugins = {p.plugin_name: p for p in api_client.get_all_plugins(seed)}
 
-    credentials, repositories, repository_info = generate_splitgraph_yml(all_plugins, seed)
+    decoded_seed = ProjectSeed.decode(seed)
+    credentials, repositories, repository_info = generate_splitgraph_yml(all_plugins, decoded_seed)
 
     yml = ruamel.yaml.YAML()
     with open(os.path.join(basedir, "splitgraph.credentials.yml"), "w") as f:
@@ -176,7 +187,7 @@ def generate_project(
         yml.dump(repositories, f)
 
     # Generate the dbt project
-    if seed.include_dbt:
+    if decoded_seed.include_dbt:
         dbt_repo, _, is_dbt = repository_info[-1]
         assert is_dbt
         dbt_sources = [r for r, _, is_dbt in repository_info if not is_dbt]
diff --git a/splitgraph/cloud/queries.py b/splitgraph/cloud/queries.py
@@ -244,8 +244,8 @@
 }
 """
 
-GET_PLUGINS = """query ExternalPlugins {
-  externalPlugins {
+GET_PLUGINS = """query ExternalPlugins($seed: String) {
+  externalPlugins(seed: $seed) {
     pluginName
     name
     description
diff --git a/splitgraph/commandline/cloud.py b/splitgraph/commandline/cloud.py
@@ -1179,11 +1179,11 @@ def validate_c(repositories_file):
 def seed_c(remote, seed, github_repository, directory):
     """Generate a starter Splitgraph Cloud project from a seed."""
     from splitgraph.cloud import GQLAPIClient
-    from splitgraph.cloud.project.generation import ProjectSeed, generate_project
+    from splitgraph.cloud.project.generation import generate_project
 
     client = GQLAPIClient(remote)
 
-    generate_project(client, ProjectSeed.decode(seed), directory, github_repo=github_repository)
+    generate_project(client, seed, directory, github_repo=github_repository)
     click.echo(f"Splitgraph project generated in {os.path.abspath(directory)}.")
 
 
diff --git a/test/splitgraph/cloud/project/test_generation.py b/test/splitgraph/cloud/project/test_generation.py
@@ -23,7 +23,9 @@ def test_generate_project_no_dbt(snapshot):
     ), TemporaryDirectory() as tmpdir:
         generate_project(
             GQLAPIClient("anyremote"),
-            seed=ProjectSeed(namespace="myns", plugins=["postgres_fdw", "airbyte-postgres"]),
+            seed=ProjectSeed(
+                namespace="myns", plugins=["postgres_fdw", "airbyte-postgres"]
+            ).encode(),
             basedir=tmpdir,
             github_repo="my/repo",
         )
@@ -63,7 +65,7 @@ def test_generate_project_with_dbt(snapshot):
             GQLAPIClient("anyremote"),
             seed=ProjectSeed(
                 namespace="myns", plugins=["postgres_fdw", "airbyte-postgres"], include_dbt=True
-            ),
+            ).encode(),
             basedir=tmpdir,
             github_repo="my/repo",
         )

Original file line number	Diff line number	Diff line change
`@@ -948,9 +948,9 @@ def _make_plugin(plugin_dict: Dict[str, Any]) -> Plugin:`
`948`	`948`	`supports_mount=plugin_dict["supportsMount"],`
`949`	`949`	`)`
`950`	`950`
`951`		`- def get_all_plugins(self) -> List[Plugin]:`
	`951`	`+ def get_all_plugins(self, seed: Optional[str] = None) -> List[Plugin]:`
`952`	`952`	`response = self._gql(`
`953`		`- {"query": GET_PLUGINS, "operationName": "ExternalPlugins"},`
	`953`	`+ {"query": GET_PLUGINS, "operationName": "ExternalPlugins", "variables": {"seed": seed}},`
`954`	`954`	`handle_errors=True,`
`955`	`955`	`anonymous_ok=True,`
`956`	`956`	`)`