Skip to content

Commit f73adf7

Browse files
Removed writes to org namespaced init files during install, removed unused methods
1 parent 106cc86 commit f73adf7

File tree

2 files changed

+0
-80
lines changed

2 files changed

+0
-80
lines changed

guardrails/hub/validator_package_service.py

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from typing import List, Literal, Optional
99
from types import ModuleType
10-
from pydash.strings import snake_case
1110
from packaging.utils import canonicalize_name # PEP 503
1211

1312
from guardrails.logger import logger as guardrails_logger
@@ -104,20 +103,9 @@ def get_validator_from_manifest(manifest: Manifest) -> ModuleType:
104103
# Reload or import the module
105104
return ValidatorPackageService.reload_module(import_line)
106105

107-
@staticmethod
108-
def get_org_and_package_dirs(
109-
manifest: Manifest,
110-
) -> List[str]:
111-
org_name = manifest.namespace
112-
package_name = manifest.package_name
113-
org = snake_case(org_name if len(org_name) > 1 else "")
114-
package = snake_case(package_name if len(package_name) > 1 else package_name)
115-
return list(filter(None, [org, package]))
116-
117106
@staticmethod
118107
def add_to_hub_inits(manifest: Manifest, site_packages: str):
119108
validator_id = manifest.id
120-
org_package = ValidatorPackageService.get_org_and_package_dirs(manifest)
121109
exports: List[str] = manifest.exports or []
122110
sorted_exports = sorted(exports, reverse=True)
123111

@@ -141,27 +129,6 @@ def add_to_hub_inits(manifest: Manifest, site_packages: str):
141129
hub_init.write(import_line)
142130
hub_init.close()
143131

144-
namespace = org_package[0]
145-
namespace_init_location = os.path.join(
146-
site_packages, "guardrails", "hub", namespace, "__init__.py"
147-
)
148-
if os.path.isfile(namespace_init_location):
149-
with open(namespace_init_location, "a+") as namespace_init:
150-
namespace_init.seek(0, 0)
151-
content = namespace_init.read()
152-
if import_line in content:
153-
namespace_init.close()
154-
else:
155-
namespace_init.seek(0, 2)
156-
if len(content) > 0:
157-
namespace_init.write("\n")
158-
namespace_init.write(import_line)
159-
namespace_init.close()
160-
else:
161-
with open(namespace_init_location, "w") as namespace_init:
162-
namespace_init.write(import_line)
163-
namespace_init.close()
164-
165132
@staticmethod
166133
def get_module_path(package_name):
167134
try:

tests/unit_tests/hub/test_validator_package_service.py

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -487,53 +487,6 @@ def test_get_validator_from_manifest(self, mock_reload_module):
487487

488488
mock_reload_module.assert_called_once_with("guardrails_grhub_id")
489489

490-
@pytest.mark.parametrize(
491-
"manifest,expected",
492-
[
493-
(
494-
Manifest.from_dict(
495-
{
496-
"id": "guardrails-ai/id",
497-
"name": "name",
498-
"author": {"name": "me", "email": "[email protected]"},
499-
"maintainers": [],
500-
"repository": {"url": "some-repo"},
501-
"namespace": "guardrails-ai",
502-
"packageName": "test-validator",
503-
"moduleName": "test_validator",
504-
"description": "description",
505-
"exports": ["TestValidator"],
506-
"tags": {},
507-
}
508-
),
509-
["guardrails_ai", "test_validator"],
510-
),
511-
(
512-
Manifest.from_dict(
513-
{
514-
"id": "guardrails-ai/id",
515-
"name": "name",
516-
"author": {"name": "me", "email": "[email protected]"},
517-
"maintainers": [],
518-
"repository": {"url": "some-repo"},
519-
"namespace": "",
520-
"packageName": "test-validator",
521-
"moduleName": "test_validator",
522-
"description": "description",
523-
"exports": ["TestValidator"],
524-
"tags": {},
525-
}
526-
),
527-
["test_validator"],
528-
),
529-
],
530-
)
531-
def test_get_org_and_package_dirs(self, manifest, expected):
532-
from guardrails.hub.validator_package_service import ValidatorPackageService
533-
534-
actual = ValidatorPackageService.get_org_and_package_dirs(manifest)
535-
assert actual == expected
536-
537490
def test_get_module_name_valid(self):
538491
module_name, module_version = ValidatorPackageService.get_validator_id(
539492
"hub://test-module>=1.0.0"

0 commit comments

Comments
 (0)