feat: included project id in project specific files (#736)

Author: jakub-safetycli

safety/init/command.py

@@ -645,13 +645,10 @@ def do_init(
         console.line()
 
         if ask_codebase_setup(ctx, prompt_user):
-            configure_local_directory(
-                project_dir,
-                org_slug,
-            )
-
             project_created, project_status = create_project(ctx, console, project_dir)
 
+            configure_local_directory(project_dir, org_slug, ctx.obj.project.id)
+
             emit_codebase_setup_completed(
                 event_bus=ctx.obj.event_bus,
                 ctx=ctx,

safety/tool/constants.py

@@ -1,5 +1,8 @@
 PUBLIC_REPOSITORY_URL = "https://pkgs.safetycli.com/repository/public/pypi/simple/"
 ORGANIZATION_REPOSITORY_URL = "https://pkgs.safetycli.com/repository/{}/pypi/simple/"
+PROJECT_REPOSITORY_URL = (
+    "https://pkgs.safetycli.com/repository/{}/project/{}/pypi/simple/"
+)
 PROJECT_CONFIG = ".safety-project.ini"
 
 MOST_FREQUENTLY_DOWNLOADED_PYPI_PACKAGES = [

safety/tool/main.py

@@ -82,7 +82,9 @@ def configure_alias() -> Optional[List[Tuple[ToolType, Optional[Path]]]]:
     return [(ToolType.PIP, None), (ToolType.POETRY, None), (ToolType.UV, None)]
 
 
-def configure_local_directory(directory: Path, org_slug: Optional[str]):
+def configure_local_directory(
+    directory: Path, org_slug: Optional[str], project_id: Optional[str]
+):
     configurators = [
         PipRequirementsConfigurator(),
         PoetryPyprojectConfigurator(),
@@ -94,4 +96,4 @@ def configure_local_directory(directory: Path, org_slug: Optional[str]):
             file = Path(file_name)
             for configurator in configurators:
                 if configurator.is_supported(file):
-                    configurator.configure(file, org_slug)
+                    configurator.configure(file, org_slug, project_id)

safety/tool/pip/main.py

@@ -11,7 +11,11 @@
 import typer
 from rich.console import Console
 
-from safety.tool.constants import PUBLIC_REPOSITORY_URL, ORGANIZATION_REPOSITORY_URL
+from safety.tool.constants import (
+    PUBLIC_REPOSITORY_URL,
+    ORGANIZATION_REPOSITORY_URL,
+    PROJECT_REPOSITORY_URL,
+)
 from safety.tool.resolver import get_unwrapped_command
 
 from safety.console import main_console
@@ -36,6 +40,7 @@ def configure_requirements(
         cls,
         file: Path,
         org_slug: Optional[str],
+        project_id: Optional[str],
         console: Console = main_console,
     ) -> Optional[Path]:
         """
@@ -44,16 +49,21 @@ def configure_requirements(
         Args:
             file (Path): Path to requirements.txt file.
             org_slug (str): Organization slug.
+            project_id (str): Project identifier.
             console (Console): Console instance.
         """
 
         with open(file, "r+") as f:
             content = f.read()
 
             repository_url = (
-                ORGANIZATION_REPOSITORY_URL.format(org_slug)
-                if org_slug
-                else PUBLIC_REPOSITORY_URL
+                PROJECT_REPOSITORY_URL.format(org_slug, project_id)
+                if project_id and org_slug
+                else (
+                    ORGANIZATION_REPOSITORY_URL.format(org_slug)
+                    if org_slug
+                    else PUBLIC_REPOSITORY_URL
+                )
             )
             index_config = f"-i {repository_url}\n"
             if content.find(index_config) == -1:

safety/tool/poetry/command.py

@@ -154,4 +154,3 @@ def before(self, ctx: typer.Context):
 
         _, modified_args = self.patch_source_option(self._args)
         self._args = modified_args
-        print(self._args)

safety/tool/poetry/main.py

@@ -6,10 +6,13 @@
 from typing import Optional
 
 from rich.console import Console
-import urllib.parse
 
 from safety.console import main_console
-from safety.tool.constants import PUBLIC_REPOSITORY_URL, ORGANIZATION_REPOSITORY_URL
+from safety.tool.constants import (
+    PUBLIC_REPOSITORY_URL,
+    ORGANIZATION_REPOSITORY_URL,
+    PROJECT_REPOSITORY_URL,
+)
 from safety.tool.resolver import get_unwrapped_command
 
 if sys.version_info >= (3, 11):
@@ -64,14 +67,14 @@ def configure_pyproject(
             return None
 
         repository_url = (
-            ORGANIZATION_REPOSITORY_URL.format(org_slug)
-            if org_slug
-            else PUBLIC_REPOSITORY_URL
-        )
-        if project_id:
-            repository_url = repository_url + urllib.parse.urlencode(
-                {"project-id": project_id}
+            PROJECT_REPOSITORY_URL.format(org_slug, project_id)
+            if project_id and org_slug
+            else (
+                ORGANIZATION_REPOSITORY_URL.format(org_slug)
+                if org_slug
+                else PUBLIC_REPOSITORY_URL
             )
+        )
         result = subprocess.run(
             [
                 get_unwrapped_command(name="poetry"),

safety/tool/utils.py

@@ -34,12 +34,15 @@ def is_supported(self, file: Path) -> bool:
         pass
 
     @abc.abstractmethod
-    def configure(self, file: Path, org_slug: Optional[str]) -> Optional[Path]:
+    def configure(
+        self, file: Path, org_slug: Optional[str], project_id: Optional[str]
+    ) -> Optional[Path]:
         """
         Configures specific file.
         Args:
             file (str): The file to configure.
             org_slug (str): The organization slug.
+            project_id (str): The project identifier.
         """
         pass
 
@@ -50,8 +53,10 @@ class PipRequirementsConfigurator(BuildFileConfigurator):
     def is_supported(self, file: Path) -> bool:
         return self.__file_name_pattern.match(os.path.basename(file)) is not None
 
-    def configure(self, file: Path, org_slug: Optional[str]) -> None:
-        Pip.configure_requirements(file, org_slug)  # type: ignore
+    def configure(
+        self, file: Path, org_slug: Optional[str], project_id: Optional[str]
+    ) -> None:
+        Pip.configure_requirements(file, org_slug, project_id)
 
 
 class PoetryPyprojectConfigurator(BuildFileConfigurator):
@@ -62,9 +67,11 @@ def is_supported(self, file: Path) -> bool:
             os.path.basename(file)
         ) is not None and Poetry.is_poetry_project_file(file)
 
-    def configure(self, file: Path, org_slug: Optional[str]) -> Optional[Path]:
+    def configure(
+        self, file: Path, org_slug: Optional[str], project_id: Optional[str]
+    ) -> Optional[Path]:
         if self.is_supported(file):
-            return Poetry.configure_pyproject(file, org_slug)  # type: ignore
+            return Poetry.configure_pyproject(file, org_slug, project_id)  # type: ignore
         return None
 
 
@@ -124,7 +131,9 @@ def is_supported(self, file: Path) -> bool:
             and Path("pyproject.toml").exists()
         )
 
-    def configure(self, file: Path, org_slug: Optional[str]) -> Optional[Path]:
+    def configure(
+        self, file: Path, org_slug: Optional[str], project_id: Optional[str]
+    ) -> Optional[Path]:
         if self.is_supported(file):
-            return Uv.configure_pyproject(Path("pyproject.toml"), org_slug)
+            return Uv.configure_pyproject(Path("pyproject.toml"), org_slug, project_id)
         return None

safety/tool/uv/main.py

@@ -4,12 +4,15 @@
 import shutil
 import sys
 from typing import Any, Dict, Optional
-import urllib.parse
 import tomlkit
 
 from rich.console import Console
 from safety.console import main_console
-from safety.tool.constants import ORGANIZATION_REPOSITORY_URL, PUBLIC_REPOSITORY_URL
+from safety.tool.constants import (
+    ORGANIZATION_REPOSITORY_URL,
+    PUBLIC_REPOSITORY_URL,
+    PROJECT_REPOSITORY_URL,
+)
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -72,14 +75,14 @@ def configure_pyproject(
             return None
 
         repository_url = (
-            ORGANIZATION_REPOSITORY_URL.format(org_slug)
-            if org_slug
-            else PUBLIC_REPOSITORY_URL
-        )
-        if project_id:
-            repository_url = repository_url + urllib.parse.urlencode(
-                {"project-id": project_id}
+            PROJECT_REPOSITORY_URL.format(org_slug, project_id)
+            if project_id and org_slug
+            else (
+                ORGANIZATION_REPOSITORY_URL.format(org_slug)
+                if org_slug
+                else PUBLIC_REPOSITORY_URL
             )
+        )
         try:
             content = file.read_text()
             doc: Dict[str, Any] = tomlkit.loads(content)