Code refactor

Author: sarasavilli-sf

src/datacustomcode/cli.py

@@ -134,9 +134,12 @@ def auth(profile: str):
 @click.option("--network", default="default")
 def zip(path: str, network: str):
     from datacustomcode.deploy import zip
+    from datacustomcode.scan import find_base_directory, get_package_type
 
     logger.debug("Zipping project")
-    zip(path, network)
+    base_directory = find_base_directory(path)
+    package_type = get_package_type(base_directory)
+    zip(path, network, package_type)
 
 
 @cli.command()

src/datacustomcode/deploy.py

@@ -527,28 +527,14 @@ def upload_zip(file_upload_url: str) -> None:
         response.raise_for_status()
 
 
-def _get_package_type_for_directory(directory: str) -> str:
-    """Resolve package type (script/function) for the given payload directory."""
-    try:
-        base_directory = find_base_directory(os.path.abspath(directory))
-        return get_package_type(base_directory)
-    except (ValueError, FileNotFoundError) as e:
-        logger.debug(
-            f"Could not determine package type for {directory}: {e}. "
-            "Defaulting to 'script'"
-        )
-        return "script"
-
-
 def zip(
     directory: str,
     docker_network: str,
+    package_type: str,
 ):
     # Create a zip file excluding .DS_Store files
     import zipfile
 
-    package_type = _get_package_type_for_directory(directory)
-
     # prepare payload only if requirements.txt is non-empty
     if has_nonempty_requirements_file(directory):
         prepare_dependency_archive(directory, docker_network, package_type)
@@ -590,7 +576,7 @@ def deploy_full(
 
     # create deployment and upload payload
     deployment = create_deployment(access_token, metadata)
-    zip(directory, docker_network)
+    zip(directory, docker_network, metadata.codeType)
     upload_zip(deployment.fileUploadUrl)
     wait_for_deployment(access_token, metadata, callback)
 

tests/test_deploy.py

@@ -26,7 +26,6 @@
         CreateDeploymentResponse,
         DataTransformConfig,
         DeploymentsResponse,
-        _get_package_type_for_directory,
         _make_api_call,
         _retrieve_access_token,
         _retrieve_access_token_from_sf_cli,
@@ -446,66 +445,6 @@ def join_side_effect(*args):
         mock_docker_run_cmd.assert_called_once_with("default", "/tmp/test_dir")
 
 
-class TestGetPackageTypeForDirectory:
-    @patch("datacustomcode.deploy.get_package_type")
-    @patch("datacustomcode.deploy.find_base_directory")
-    def test_get_package_type_function(
-        self, mock_find_base, mock_get_package_type
-    ):
-        """Test _get_package_type_for_directory returns function type."""
-        mock_find_base.return_value = "/project/root"
-        mock_get_package_type.return_value = "function"
-
-        result = _get_package_type_for_directory("/project/root/payload")
-
-        assert result == "function"
-        mock_find_base.assert_called_once()
-        mock_get_package_type.assert_called_once_with("/project/root")
-
-    @patch("datacustomcode.deploy.get_package_type")
-    @patch("datacustomcode.deploy.find_base_directory")
-    def test_get_package_type_script(self, mock_find_base, mock_get_package_type):
-        """Test _get_package_type_for_directory returns script type."""
-        mock_find_base.return_value = "/project/root"
-        mock_get_package_type.return_value = "script"
-
-        result = _get_package_type_for_directory("/project/root/payload")
-
-        assert result == "script"
-        mock_find_base.assert_called_once()
-        mock_get_package_type.assert_called_once_with("/project/root")
-
-    @patch("datacustomcode.deploy.get_package_type")
-    @patch("datacustomcode.deploy.find_base_directory")
-    def test_get_package_type_file_not_found(
-        self, mock_find_base, mock_get_package_type
-    ):
-        """Test _get_package_type_for_directory defaults to script when config not found."""
-        mock_find_base.return_value = "/project/root"
-        mock_get_package_type.side_effect = FileNotFoundError("Config not found")
-
-        result = _get_package_type_for_directory("/project/root/payload")
-
-        assert result == "script"
-        mock_find_base.assert_called_once()
-        mock_get_package_type.assert_called_once_with("/project/root")
-
-    @patch("datacustomcode.deploy.get_package_type")
-    @patch("datacustomcode.deploy.find_base_directory")
-    def test_get_package_type_value_error(
-        self, mock_find_base, mock_get_package_type
-    ):
-        """Test _get_package_type_for_directory defaults to script on ValueError."""
-        mock_find_base.return_value = "/project/root"
-        mock_get_package_type.side_effect = ValueError("Invalid type")
-
-        result = _get_package_type_for_directory("/project/root/payload")
-
-        assert result == "script"
-        mock_find_base.assert_called_once()
-        mock_get_package_type.assert_called_once_with("/project/root")
-
-
 class TestHasNonemptyRequirementsFile:
     @patch("datacustomcode.deploy.os.path.dirname")
     @patch("datacustomcode.deploy.os.path.isfile")
@@ -806,7 +745,7 @@ def test_zip_with_requirements(
             ("/test/dir/subdir", [], ["file3.py"]),
         ]
 
-        zip("/test/dir", "default")
+        zip("/test/dir", "default", "script")
 
         mock_has_requirements.assert_called_once_with("/test/dir")
         mock_prepare.assert_called_once_with("/test/dir", "default", "script")
@@ -834,7 +773,7 @@ def test_zip_without_requirements(
             ("/test/dir/subdir", [], ["file3.py"]),
         ]
 
-        zip("/test/dir", "default")
+        zip("/test/dir", "default", "script")
 
         mock_has_requirements.assert_called_once_with("/test/dir")
         mock_prepare.assert_not_called()
@@ -843,7 +782,6 @@ def test_zip_without_requirements(
         )
         assert mock_zipfile_instance.write.call_count == 3  # One call per file
 
-    @patch("datacustomcode.deploy._get_package_type_for_directory")
     @patch("datacustomcode.deploy.has_nonempty_requirements_file")
     @patch("datacustomcode.deploy.prepare_dependency_archive")
     @patch("zipfile.ZipFile")
@@ -854,11 +792,9 @@ def test_zip_with_function_package_type(
         mock_zipfile,
         mock_prepare,
         mock_has_requirements,
-        mock_get_package_type,
     ):
         """Test zipping a directory with function package type."""
         mock_has_requirements.return_value = True
-        mock_get_package_type.return_value = "function"
         mock_zipfile_instance = MagicMock()
         mock_zipfile.return_value.__enter__.return_value = mock_zipfile_instance
         mock_zipfile_instance.write = MagicMock()
@@ -869,10 +805,9 @@ def test_zip_with_function_package_type(
             ("/test/dir/subdir", [], ["file3.py"]),
         ]
 
-        zip("/test/dir", "default")
+        zip("/test/dir", "default", "function")
 
         mock_has_requirements.assert_called_once_with("/test/dir")
-        mock_get_package_type.assert_called_once_with("/test/dir")
         mock_prepare.assert_called_once_with("/test/dir", "default", "function")
         mock_zipfile.assert_called_once_with(
             "deployment.zip", "w", zipfile.ZIP_DEFLATED
@@ -1167,7 +1102,7 @@ def test_deploy_full(
         mock_retrieve_token.assert_called_once_with(credentials)
         mock_get_config.assert_called_once_with("/test/dir")
         mock_create_deployment.assert_called_once_with(access_token, metadata)
-        mock_zip.assert_called_once_with("/test/dir", "default")
+        mock_zip.assert_called_once_with("/test/dir", "default", "script")
         mock_upload_zip.assert_called_once_with("https://upload.example.com")
         mock_wait.assert_called_once_with(access_token, metadata, callback)
         mock_create_transform.assert_called_once_with(
@@ -1231,7 +1166,7 @@ def test_deploy_full_client_credentials(
         mock_retrieve_token.assert_called_once_with(credentials)
         mock_get_config.assert_called_once_with("/test/dir")
         mock_create_deployment.assert_called_once_with(access_token, metadata)
-        mock_zip.assert_called_once_with("/test/dir", "default")
+        mock_zip.assert_called_once_with("/test/dir", "default", "script")
         mock_upload_zip.assert_called_once_with("https://upload.example.com")
         mock_wait.assert_called_once_with(access_token, metadata, callback)
         mock_create_transform.assert_called_once_with(
@@ -1337,7 +1272,7 @@ def test_deploy_full_happy_path(
         mock_retrieve_token.assert_called_once_with(credentials)
         mock_get_config.assert_called_once_with("/test/dir")
         mock_create_deployment.assert_called_once_with(access_token, metadata)
-        mock_zip.assert_called_once_with("/test/dir", "default")
+        mock_zip.assert_called_once_with("/test/dir", "default", "script")
         mock_upload_zip.assert_called_once_with("https://upload.example.com")
         mock_wait.assert_called_once_with(access_token, metadata, callback)
         mock_create_transform.assert_called_once_with(