Deprecate sheety API (#14004)

* deprecate sheety

Co-authored-by: manskx <[email protected]>
(cherry picked from commit b8739a0)

Author: manskx

src/lightning_app/cli/cmd_install.py

@@ -8,6 +8,8 @@
 
 import requests
 
+from lightning_app.core.constants import LIGHTNING_APPS_PUBLIC_REGISTRY, LIGHTNING_COMPONENT_PUBLIC_REGISTRY
+
 logger = logging.getLogger(__name__)
 
 
@@ -295,8 +297,16 @@ def _validate_name(name, resource_type, example):
 
 
 def _resolve_resource(registry_url, name, version_arg, resource_type):
+    gallery_entries = []
     try:
         url = requests.get(registry_url)
+        data = json.loads(url.text)
+
+        if resource_type == "app":
+            gallery_entries = [a for a in data["apps"] if a["canDownloadSourceCode"]]
+
+        elif resource_type == "component":
+            gallery_entries = data["components"]
     except requests.ConnectionError:
         m = f"""
         Network connection error, could not load list of available Lightning {resource_type}s.
@@ -306,12 +316,9 @@ def _resolve_resource(registry_url, name, version_arg, resource_type):
         sys.tracebacklimit = 0
         raise SystemError(m)
 
-    data = json.loads(url.text)
-    data = data[resource_type + "s"]
-
     entries = []
     all_versions = []
-    for x in data:
+    for x in gallery_entries:
         if name == x["name"]:
             entries.append(x)
             all_versions.append(x["version"])
@@ -473,12 +480,10 @@ def _install_component(git_url):
 
 
 def _resolve_app_registry():
-    public_registry = "https://api.sheety.co/e559626ba514c7ba80caae1e38a8d4f4/lightningAppRegistry/apps"
-    registry = os.environ.get("LIGHTNING_APP_REGISTRY", public_registry)
+    registry = os.environ.get("LIGHTNING_APP_REGISTRY", LIGHTNING_APPS_PUBLIC_REGISTRY)
     return registry
 
 
 def _resolve_component_registry():
-    public_registry = "https://api.sheety.co/e559626ba514c7ba80caae1e38a8d4f4/lightningAppRegistry/components"
-    registry = os.environ.get("LIGHTNING_COMPONENT_REGISTRY", public_registry)
+    registry = os.environ.get("LIGHTNING_COMPONENT_REGISTRY", LIGHTNING_COMPONENT_PUBLIC_REGISTRY)
     return registry

src/lightning_app/core/constants.py

@@ -32,6 +32,9 @@
 LIGHTNING_CREDENTIAL_PATH = os.getenv("LIGHTNING_CREDENTIAL_PATH", str(Path.home() / ".lightning" / "credentials.json"))
 DOT_IGNORE_FILENAME = ".lightningignore"
 
+LIGHTNING_COMPONENT_PUBLIC_REGISTRY = "https://lightning.ai/v1/components"
+LIGHTNING_APPS_PUBLIC_REGISTRY = "https://lightning.ai/v1/apps"
+
 
 def get_lightning_cloud_url() -> str:
     # DO NOT CHANGE!

src/lightning_app/runners/cloud.py

@@ -147,7 +147,7 @@ def dispatch(
                 # There can be only one app with unique project_id<>name pair
                 lightning_app = list_apps_resp.lightningapps[0]
             else:
-                app_body = Body7(name=app_config.name)
+                app_body = Body7(name=app_config.name, can_download_source_code=True)
                 lightning_app = self.backend.client.lightningapp_v2_service_create_lightningapp_v2(
                     project.project_id, app_body
                 )

tests/tests_app/cli/test_cmd_install.py

@@ -27,7 +27,8 @@ def test_valid_org_app_name():
     assert result.exit_code
 
     # assert a good (and availablea name) works
-    real_app = "lightning/install-app"
+    # This should be an app that's always in the gallery
+    real_app = "lightning/invideo"
     result = runner.invoke(lightning_cli.install_app, [real_app])
     assert "Press enter to continue:" in result.output
 
@@ -145,7 +146,7 @@ def test_component_install(real_component, test_component_pip_name):
 
 def test_prompt_actions():
     # TODO: each of these installs must check that a package is installed in the environment correctly
-    app_to_use = "lightning/install-app"
+    app_to_use = "lightning/invideo"
 
     runner = CliRunner()
 
@@ -197,43 +198,42 @@ def test_version_arg_component(tmpdir, monkeypatch):
 def test_version_arg_app(tmpdir):
 
     # Version does not exist
-    app_name = "lightning/hackernews-app"
+    app_name = "lightning/invideo"
     version_arg = "NOT-EXIST"
     runner = CliRunner()
     result = runner.invoke(lightning_cli.install_app, [app_name, f"--version={version_arg}"])
     assert f"app: 'Version {version_arg} for {app_name}' is not" in str(result.exception)
     assert result.exit_code == 1
 
     # Version exists
-    version_arg = "0.0.1"
+    version_arg = "0.0.2"
     runner = CliRunner()
     result = runner.invoke(lightning_cli.install_app, [app_name, f"--version={version_arg}", "--yes"])
     assert result.exit_code == 0
 
 
 def test_proper_url_parsing():
 
-    name = "lightning/install-app"
+    name = "lightning/invideo"
 
     # make sure org/app-name name is correct
     org, app = cmd_install._validate_name(name, resource_type="app", example="lightning/lit-slack-component")
     assert org == "lightning"
-    assert app == "install-app"
+    assert app == "invideo"
 
     # resolve registry (orgs can have a private registry through their environment variables)
     registry_url = cmd_install._resolve_app_registry()
-    assert registry_url == "https://api.sheety.co/e559626ba514c7ba80caae1e38a8d4f4/lightningAppRegistry/apps"
+    assert registry_url == "https://lightning.ai/v1/apps"
 
     # load the component resource
     component_entry = cmd_install._resolve_resource(registry_url, name=name, version_arg="latest", resource_type="app")
 
     source_url, git_url, folder_name, git_sha = cmd_install._show_install_app_prompt(
         component_entry, app, org, True, resource_type="app"
     )
-    assert folder_name == "install-app"
+    assert folder_name == "LAI-InVideo-search-App"
     # FixMe: this need to be updated after release with updated org rename
-    assert source_url == "https://github.com/PyTorchLightning/install-app"
-    assert git_url.find("@") > 10  # TODO: this will be removed once the apps repos will be public
+    assert source_url == "https://github.com/Lightning-AI/LAI-InVideo-search-App"
     assert "#ref" not in git_url
     assert git_sha
 
@@ -286,20 +286,20 @@ def test_install_app_shows_error(tmpdir):
 # os.chdir(cwd)
 
 
-def test_public_app_registry():
-    registry = cmd_install._resolve_app_registry()
-    assert registry == "https://api.sheety.co/e559626ba514c7ba80caae1e38a8d4f4/lightningAppRegistry/apps"
-
-
 @mock.patch.dict(os.environ, {"LIGHTNING_APP_REGISTRY": "https://TODO/other_non_PL_registry"})
 def test_private_app_registry():
     registry = cmd_install._resolve_app_registry()
     assert registry == "https://TODO/other_non_PL_registry"
 
 
+def test_public_app_registry():
+    registry = cmd_install._resolve_app_registry()
+    assert registry == "https://lightning.ai/v1/apps"
+
+
 def test_public_component_registry():
     registry = cmd_install._resolve_component_registry()
-    assert registry == "https://api.sheety.co/e559626ba514c7ba80caae1e38a8d4f4/lightningAppRegistry/components"
+    assert registry == "https://lightning.ai/v1/components"
 
 
 @mock.patch.dict(os.environ, {"LIGHTNING_COMPONENT_REGISTRY": "https://TODO/other_non_PL_registry"})