remove make_source_manifest in favor of Manifest class

Author: mslynch

rsconnect/actions.py

@@ -14,6 +14,8 @@
 from typing import IO
 from warnings import warn
 from os.path import abspath, basename, dirname, exists, isdir, join, relpath, splitext
+
+from .bundle import Manifest
 from .exception import RSConnectException
 from . import api
 from .bundle import (
@@ -32,9 +34,6 @@
     make_notebook_source_bundle,
     make_quarto_source_bundle,
     make_quarto_manifest,
-    make_source_manifest,
-    manifest_add_buffer,
-    manifest_add_file,
     read_manifest_app_mode,
     read_manifest_file,
 )
@@ -1295,8 +1294,9 @@ def create_api_deployment_bundle(
     if app_mode is None:
         app_mode = AppModes.PYTHON_API
 
-    return make_api_bundle(directory, entry_point, app_mode, environment, extra_files, excludes,
-                           image, env_management_py, env_management_r)
+    return make_api_bundle(
+        directory, entry_point, app_mode, environment, extra_files, excludes, image, env_management_py, env_management_r
+    )
 
 
 def create_quarto_deployment_bundle(
@@ -1333,8 +1333,17 @@ def create_quarto_deployment_bundle(
     if app_mode is None:
         app_mode = AppModes.STATIC_QUARTO
 
-    return make_quarto_source_bundle(file_or_directory, inspect, app_mode, environment, extra_files, excludes,
-                                     image, env_management_py, env_management_r)
+    return make_quarto_source_bundle(
+        file_or_directory,
+        inspect,
+        app_mode,
+        environment,
+        extra_files,
+        excludes,
+        image,
+        env_management_py,
+        env_management_r,
+    )
 
 
 def deploy_bundle(
@@ -1442,8 +1451,15 @@ def create_notebook_manifest_and_environment_file(
     warn("This method has been moved and will be deprecated.", DeprecationWarning, stacklevel=2)
     if (
         not write_notebook_manifest_json(
-            entry_point_file, environment, app_mode, extra_files, hide_all_input, hide_tagged_input,
-            image, env_management_py, env_management_r,
+            entry_point_file,
+            environment,
+            app_mode,
+            extra_files,
+            hide_all_input,
+            hide_tagged_input,
+            image,
+            env_management_py,
+            env_management_r,
         )
         or force
     ):
@@ -1496,15 +1512,22 @@ def write_notebook_manifest_json(
         if app_mode == AppModes.UNKNOWN:
             raise RSConnectException('Could not determine the app mode from "%s"; please specify one.' % extension)
 
-    manifest_data = make_source_manifest(app_mode, environment, file_name, None,
-                                         image, env_management_py, env_management_r)
-    manifest_add_file(manifest_data, file_name, directory)
-    manifest_add_buffer(manifest_data, environment.filename, environment.contents)
+    manifest = Manifest(
+        app_mode=app_mode,
+        environment=environment,
+        entrypoint=file_name,
+        quarto_inspection=None,
+        image=image,
+        env_management_py=env_management_py,
+        env_management_r=env_management_r,
+    )
+    manifest.add_file_relative(file_name, directory)
+    manifest.add_buffer(environment.filename, environment.contents)
 
     for rel_path in extra_files:
-        manifest_add_file(manifest_data, rel_path, directory)
+        manifest.add_file_relative(rel_path, directory)
 
-    write_manifest_json(manifest_path, manifest_data)
+    write_manifest_json(manifest_path, manifest.data)
 
     return exists(join(directory, environment.filename))
 
@@ -1544,8 +1567,17 @@ def create_api_manifest_and_environment_file(
     """
     warn("This method has been moved and will be deprecated.", DeprecationWarning, stacklevel=2)
     if (
-        not write_api_manifest_json(directory, entry_point, environment, app_mode, extra_files, excludes,
-                                    image, env_management_py, env_management_r)
+        not write_api_manifest_json(
+            directory,
+            entry_point,
+            environment,
+            app_mode,
+            extra_files,
+            excludes,
+            image,
+            env_management_py,
+            env_management_r,
+        )
         or force
     ):
         write_environment_file(environment, directory)
@@ -1584,8 +1616,9 @@ def write_api_manifest_json(
     """
     warn("This method has been moved and will be deprecated.", DeprecationWarning, stacklevel=2)
     extra_files = validate_extra_files(directory, extra_files)
-    manifest, _ = make_api_manifest(directory, entry_point, app_mode, environment, extra_files, excludes,
-                                    image, env_management_py, env_management_r)
+    manifest, _ = make_api_manifest(
+        directory, entry_point, app_mode, environment, extra_files, excludes, image, env_management_py, env_management_r
+    )
     manifest_path = join(directory, "manifest.json")
 
     write_manifest_json(manifest_path, manifest)

rsconnect/api.py

@@ -1121,14 +1121,9 @@ def create_application(self, account_id, application_name):
         return response
 
     def create_output(self, name: str, application_type: str, project_id=None, space_id=None, render_by=None):
-        data = {
-            "name": name,
-            "space": space_id,
-            "project": project_id,
-            "application_type": application_type
-        }
+        data = {"name": name, "space": space_id, "project": project_id, "application_type": application_type}
         if render_by:
-            data['render_by'] = render_by
+            data["render_by"] = render_by
         response = self.post("/v1/outputs/", body=data)
         self._server.handle_bad_response(response)
         return response
@@ -1342,9 +1337,7 @@ def prepare_deploy(
         app_store_version: typing.Optional[int],
     ) -> PrepareDeployOutputResult:
 
-        application_type = "static" if app_mode in [
-            AppModes.STATIC,
-            AppModes.STATIC_QUARTO] else "connect"
+        application_type = "static" if app_mode in [AppModes.STATIC, AppModes.STATIC_QUARTO] else "connect"
         logger.debug(f"application_type: {application_type}")
 
         render_by = "server" if app_mode == AppModes.STATIC_QUARTO else None
@@ -1362,11 +1355,13 @@ def prepare_deploy(
                 space_id = None
 
             # create the new output and associate it with the current Posit Cloud project and space
-            output = self._rstudio_client.create_output(name=app_name,
-                                                        application_type=application_type,
-                                                        project_id=project_id,
-                                                        space_id=space_id,
-                                                        render_by=render_by)
+            output = self._rstudio_client.create_output(
+                name=app_name,
+                application_type=application_type,
+                project_id=project_id,
+                space_id=space_id,
+                render_by=render_by,
+            )
             app_id_int = output["source_id"]
         else:
             # this is a redeployment of an existing output