fixed tests

Author: AlejandroEsquivel

guardrails/hub/validator_package_service.py

@@ -289,7 +289,7 @@ def install_hub_module(
         guardrails_token = settings.rc.token
 
         pip_flags = [
-            f"--index-url=https://__token__:{guardrails_token}@e4c4zula06.execute-api.us-east-1.amazonaws.com/simple",
+            f"--index-url=https://__token__:{guardrails_token}@pypi.guardrailsai.com/simple",
             "--extra-index-url=https://pypi.org/simple",
         ]
 

tests/unit_tests/hub/test_hub_install.py

@@ -18,7 +18,7 @@ class TestInstall:
     def setup_method(self):
         self.manifest = Manifest.from_dict(
             {
-                "id": "id",
+                "id": "guardrails/id",
                 "name": "name",
                 "author": {"name": "me", "email": "[email protected]"},
                 "maintainers": [],
@@ -74,32 +74,30 @@ def test_install_local_models__false(self, mocker, use_remote_inferencing):
         )
 
         install(
-            "hub://guardrails/test-validator",
+            "hub://guardrails/id",
             install_local_models=False,
             install_local_models_confirm=lambda: False,
         )
 
         log_calls = [
-            call(level=5, msg="Installing hub://guardrails/test-validator..."),
+            call(level=5, msg="Installing hub://guardrails/id..."),
             call(
                 level=5,
                 msg="Skipping post install, models will not be downloaded for local "
                 "inference.",
             ),
             call(
                 level=5,
-                msg="✅Successfully installed hub://guardrails/test-validator!\n\nImport validator:\nfrom guardrails.hub import TestValidator\n\nGet more info:\nhttps://hub.guardrailsai.com/validator/id\n",  # noqa
+                msg="✅Successfully installed hub://guardrails/id!\n\nImport validator:\nfrom guardrails.hub import TestValidator\n\nGet more info:\nhttps://hub.guardrailsai.com/validator/guardrails/id\n",  # noqa
             ),  # noqa
         ]
         assert mock_logger_log.call_count == 3
         mock_logger_log.assert_has_calls(log_calls)
 
-        get_manifest_and_site_packages_mock.assert_called_once_with(
-            "guardrails/test-validator"
-        )
+        get_manifest_and_site_packages_mock.assert_called_once_with("guardrails/id")
 
         mock_pip_install_hub_module.assert_called_once_with(
-            self.manifest, self.site_packages, quiet=ANY, upgrade=ANY, logger=ANY
+            self.manifest.id, validator_version=None, quiet=ANY, upgrade=ANY, logger=ANY
         )
         mock_add_to_hub_init.assert_called_once_with(self.manifest, self.site_packages)
 
@@ -117,6 +115,9 @@ def test_install_local_models__true(self, mocker, use_remote_inferencing):
 
         mock_logger_log = mocker.patch("guardrails.hub.install.cli_logger.log")
 
+        pkg_resources = mocker.patch("guardrails.hub.install.pkg_resources")
+        pkg_resources.get_distribution.return_value.version = "1.0.0"
+
         get_manifest_and_site_packages_mock = mocker.patch(
             "guardrails.hub.validator_package_service.ValidatorPackageService.get_manifest_and_site_packages"
         )
@@ -136,31 +137,29 @@ def test_install_local_models__true(self, mocker, use_remote_inferencing):
         )
 
         install(
-            "hub://guardrails/test-validator",
+            "hub://guardrails/id",
             install_local_models=True,
             install_local_models_confirm=lambda: True,
         )
 
         log_calls = [
-            call(level=5, msg="Installing hub://guardrails/test-validator..."),
+            call(level=5, msg="Installing hub://guardrails/id..."),
             call(
                 level=5,
                 msg="Installing models locally!",
             ),
             call(
                 level=5,
-                msg="✅Successfully installed hub://guardrails/test-validator!\n\nImport validator:\nfrom guardrails.hub import TestValidator\n\nGet more info:\nhttps://hub.guardrailsai.com/validator/id\n",  # noqa
+                msg="✅Successfully installed hub://guardrails/id!\n\nImport validator:\nfrom guardrails.hub import TestValidator\n\nGet more info:\nhttps://hub.guardrailsai.com/validator/guardrails/id\n",  # noqa
             ),  # noqa
         ]
         assert mock_logger_log.call_count == 3
         mock_logger_log.assert_has_calls(log_calls)
 
-        get_manifest_and_site_packages_mock.assert_called_once_with(
-            "guardrails/test-validator"
-        )
+        get_manifest_and_site_packages_mock.assert_called_once_with("guardrails/id")
 
         mock_pip_install_hub_module.assert_called_once_with(
-            self.manifest, self.site_packages, quiet=ANY, upgrade=ANY, logger=ANY
+            self.manifest.id, validator_version=None, quiet=ANY, upgrade=ANY, logger=ANY
         )
         mock_add_to_hub_init.assert_called_once_with(self.manifest, self.site_packages)
 
@@ -197,31 +196,29 @@ def test_install_local_models__none(self, mocker, use_remote_inferencing):
         )
 
         install(
-            "hub://guardrails/test-validator",
+            "hub://guardrails/id",
             install_local_models=None,
             install_local_models_confirm=lambda: True,
         )
 
         log_calls = [
-            call(level=5, msg="Installing hub://guardrails/test-validator..."),
+            call(level=5, msg="Installing hub://guardrails/id..."),
             call(
                 level=5,
                 msg="Installing models locally!",
             ),
             call(
                 level=5,
-                msg="✅Successfully installed hub://guardrails/test-validator!\n\nImport validator:\nfrom guardrails.hub import TestValidator\n\nGet more info:\nhttps://hub.guardrailsai.com/validator/id\n",  # noqa
+                msg="✅Successfully installed hub://guardrails/id!\n\nImport validator:\nfrom guardrails.hub import TestValidator\n\nGet more info:\nhttps://hub.guardrailsai.com/validator/guardrails/id\n",  # noqa
             ),  # noqa
         ]
         assert mock_logger_log.call_count == 3
         mock_logger_log.assert_has_calls(log_calls)
 
-        get_manifest_and_site_packages_mock.assert_called_once_with(
-            "guardrails/test-validator"
-        )
+        get_manifest_and_site_packages_mock.assert_called_once_with("guardrails/id")
 
         mock_pip_install_hub_module.assert_called_once_with(
-            self.manifest, self.site_packages, quiet=ANY, upgrade=ANY, logger=ANY
+            self.manifest.id, validator_version=None, quiet=ANY, upgrade=ANY, logger=ANY
         )
         mock_add_to_hub_init.assert_called_once_with(self.manifest, self.site_packages)
 
@@ -258,12 +255,12 @@ def test_happy_path(self, mocker, use_remote_inferencing):
         )
 
         install(
-            "hub://guardrails/test-validator",
+            "hub://guardrails/id",
             install_local_models_confirm=lambda: True,
         )
 
         log_calls = [
-            call(level=5, msg="Installing hub://guardrails/test-validator..."),
+            call(level=5, msg="Installing hub://guardrails/id..."),
             call(
                 level=5,
                 msg="Installing models locally!",  # noqa
@@ -273,12 +270,10 @@ def test_happy_path(self, mocker, use_remote_inferencing):
         assert mock_logger_log.call_count == 3
         mock_logger_log.assert_has_calls(log_calls)
 
-        get_manifest_and_site_packages_mock.assert_called_once_with(
-            "guardrails/test-validator"
-        )
+        get_manifest_and_site_packages_mock.assert_called_once_with("guardrails/id")
 
         mock_pip_install_hub_module.assert_called_once_with(
-            self.manifest, self.site_packages, quiet=ANY, upgrade=ANY, logger=ANY
+            self.manifest.id, validator_version=None, quiet=ANY, upgrade=ANY, logger=ANY
         )
         mock_add_to_hub_init.assert_called_once_with(self.manifest, self.site_packages)
 
@@ -408,7 +403,7 @@ def test_use_remote_endpoint(self, mocker, use_remote_inferencing: bool):
 
         manifest = Manifest.from_dict(
             {
-                "id": "id",
+                "id": "guardrails/test-validator",
                 "name": "name",
                 "author": {"name": "me", "email": "[email protected]"},
                 "maintainers": [],

tests/unit_tests/hub/test_validator_package_service.py

@@ -48,7 +48,7 @@ class TestAddToHubInits:
     def test_closes_early_if_already_added(self, mocker):
         manifest = Manifest.from_dict(
             {
-                "id": "id",
+                "id": "guardrails-ai/id",
                 "name": "name",
                 "author": {"name": "me", "email": "[email protected]"},
                 "maintainers": [],
@@ -69,14 +69,18 @@ def test_closes_early_if_already_added(self, mocker):
         mock_open.side_effect = [hub_init_file, ns_init_file]
 
         mock_hub_read = mocker.patch.object(hub_init_file, "read")
-        mock_hub_read.return_value = "from guardrails.hub.guardrails_ai.test_validator.validator import helper, TestValidator"  # noqa
+        mock_hub_read.return_value = (
+            "from guardrails_ai_grhub_id import helper, TestValidator"  # noqa
+        )
 
         hub_seek_spy = mocker.spy(hub_init_file, "seek")
         hub_write_spy = mocker.spy(hub_init_file, "write")
         hub_close_spy = mocker.spy(hub_init_file, "close")
 
         mock_ns_read = mocker.patch.object(ns_init_file, "read")
-        mock_ns_read.return_value = "from guardrails.hub.guardrails_ai.test_validator.validator import helper, TestValidator"  # noqa
+        mock_ns_read.return_value = (
+            "from guardrails_ai_grhub_id import helper, TestValidator"  # noqa
+        )
 
         ns_seek_spy = mocker.spy(ns_init_file, "seek")
         ns_write_spy = mocker.spy(ns_init_file, "write")
@@ -115,7 +119,7 @@ def test_closes_early_if_already_added(self, mocker):
     def test_appends_import_line_if_not_present(self, mocker):
         manifest = Manifest.from_dict(
             {
-                "id": "id",
+                "id": "guardrails-ai/id",
                 "name": "name",
                 "author": {"name": "me", "email": "[email protected]"},
                 "maintainers": [],
@@ -176,7 +180,7 @@ def test_appends_import_line_if_not_present(self, mocker):
         hub_write_calls = [
             call("\n"),
             call(
-                "from guardrails.hub.guardrails_ai.test_validator.validator import TestValidator"  # noqa
+                "from guardrails_ai_grhub_id import TestValidator"  # noqa
             ),
         ]
         hub_write_spy.assert_has_calls(hub_write_calls)
@@ -194,14 +198,14 @@ def test_appends_import_line_if_not_present(self, mocker):
         assert mock_ns_read.call_count == 1
         assert ns_write_spy.call_count == 1
         ns_write_spy.assert_called_once_with(
-            "from guardrails.hub.guardrails_ai.test_validator.validator import TestValidator"  # noqa
+            "from guardrails_ai_grhub_id import TestValidator"  # noqa
         )
         assert ns_close_spy.call_count == 1
 
     def test_creates_namespace_init_if_not_exists(self, mocker):
         manifest = Manifest.from_dict(
             {
-                "id": "id",
+                "id": "guardrails-ai/id",
                 "name": "name",
                 "author": {"name": "me", "email": "[email protected]"},
                 "maintainers": [],
@@ -222,7 +226,7 @@ def test_creates_namespace_init_if_not_exists(self, mocker):
         mock_open.side_effect = [hub_init_file, ns_init_file]
 
         mock_hub_read = mocker.patch.object(hub_init_file, "read")
-        mock_hub_read.return_value = "from guardrails.hub.guardrails_ai.test_validator.validator import TestValidator"  # noqa
+        mock_hub_read.return_value = "from guardrails_ai_grhub_id import TestValidator"  # noqa
 
         mock_ns_read = mocker.patch.object(ns_init_file, "read")
         mock_ns_read.return_value = ""
@@ -256,7 +260,7 @@ def test_creates_namespace_init_if_not_exists(self, mocker):
         assert mock_ns_read.call_count == 0
         assert ns_write_spy.call_count == 1
         ns_write_spy.assert_called_once_with(
-            "from guardrails.hub.guardrails_ai.test_validator.validator import TestValidator"  # noqa
+            "from guardrails_ai_grhub_id import TestValidator"  # noqa
         )
         assert ns_close_spy.call_count == 1
 
@@ -417,7 +421,7 @@ def test_runs_script_if_exists(self, mocker):
         mock_subprocess_check_output.assert_called_once_with(
             [
                 mock_sys_executable,
-                "./site_packages/guardrails/hub/guardrails_ai/test_validator/validator/post_install.py",  # noqa
+                "./site_packages/guardrails_ai_grhub_id/post_install.py",  # noqa
             ]
         )
 
@@ -512,7 +516,7 @@ def test_get_validator_from_manifest(self, mock_reload_module):
                         "author": {"name": "me", "email": "[email protected]"},
                         "maintainers": [],
                         "repository": {"url": "some-repo"},
-                        "namespace": "guardrails-ai",
+                        "namespace": "",
                         "packageName": "test-validator",
                         "moduleName": "test_validator",
                         "description": "description",
@@ -545,6 +549,11 @@ def test_install_hub_module(self, mocker):
         mock_pip_process = mocker.patch(
             "guardrails.hub.validator_package_service.pip_process"
         )
+        mock_settings = mocker.patch(
+            "guardrails.hub.validator_package_service.settings"
+        )
+        mock_settings.rc.token = "mock-token"
+
         inspect_report = {
             "installed": [
                 {
@@ -589,8 +598,11 @@ def test_install_hub_module(self, mocker):
         pip_calls = [
             call(
                 "install",
-                "mock-install-url",
-                ["--target=mock/install/directory", "--no-deps"],
+                "guardrails-ai-grhub-id",
+                [
+                    "--index-url=https://__token__:[email protected]/simple",
+                    "--extra-index-url=https://pypi.org/simple",
+                ],
                 quiet=False,
             ),
         ]