Updating the ProjectManager code and scripts with new layout of the o3de package scripts

.gitignore

@@ -20,3 +20,4 @@ _savebackup/
 TestResults/**
 *.swatches
 /imgui.ini
+/scripts/project_manager/logs/

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp

@@ -33,8 +33,6 @@ namespace O3DE::ProjectManager
         item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
 
         item->setData(gemInfo.m_name, RoleName);
-        const QString uuidString = gemInfo.m_uuid.ToString<AZStd::string>().c_str();
-        item->setData(uuidString, RoleUuid);
         item->setData(gemInfo.m_creator, RoleCreator);
         item->setData(gemInfo.m_gemOrigin, RoleGemOrigin);
         item->setData(aznumeric_cast<int>(gemInfo.m_platforms), RolePlatforms);
@@ -53,7 +51,7 @@ namespace O3DE::ProjectManager
         appendRow(item);
 
         const QModelIndex modelIndex = index(rowCount()-1, 0);
-        m_uuidToIndexMap[uuidString] = modelIndex;
+        m_nameToIndexMap[gemInfo.m_name] = modelIndex;
     }
 
     void GemModel::Clear()
@@ -76,11 +74,6 @@ namespace O3DE::ProjectManager
         return static_cast<GemInfo::GemOrigin>(modelIndex.data(RoleGemOrigin).toInt());
     }
 
-    QString GemModel::GetUuidString(const QModelIndex& modelIndex)
-    {
-        return modelIndex.data(RoleUuid).toString();
-    }
-
     GemInfo::Platforms GemModel::GetPlatforms(const QModelIndex& modelIndex)
     {
         return static_cast<GemInfo::Platforms>(modelIndex.data(RolePlatforms).toInt());
@@ -111,10 +104,10 @@ namespace O3DE::ProjectManager
         return modelIndex.data(RoleDocLink).toString();
     }
 
-    QModelIndex GemModel::FindIndexByUuidString(const QString& uuidString) const
+    QModelIndex GemModel::FindIndexByNameString(const QString& nameString) const
     {
-        const auto iterator = m_uuidToIndexMap.find(uuidString);
-        if (iterator != m_uuidToIndexMap.end())
+        const auto iterator = m_nameToIndexMap.find(nameString);
+        if (iterator != m_nameToIndexMap.end())
         {
             return iterator.value();
         }
@@ -122,11 +115,11 @@ namespace O3DE::ProjectManager
         return {};
     }
 
-    void GemModel::FindGemNamesByUuidStrings(QStringList& inOutGemNames)
+    void GemModel::FindGemNamesByNameStrings(QStringList& inOutGemNames)
     {
         for (QString& dependingGemString : inOutGemNames)
         {
-            QModelIndex modelIndex = FindIndexByUuidString(dependingGemString);
+            QModelIndex modelIndex = FindIndexByNameString(dependingGemString);
             if (modelIndex.isValid())
             {
                 dependingGemString = GetName(modelIndex);
@@ -147,7 +140,7 @@ namespace O3DE::ProjectManager
             return {};
         }
 
-        FindGemNamesByUuidStrings(result);
+        FindGemNamesByNameStrings(result);
         return result;
     }
 
@@ -164,7 +157,7 @@ namespace O3DE::ProjectManager
             return {};
         }
 
-        FindGemNamesByUuidStrings(result);
+        FindGemNamesByNameStrings(result);
         return result;
     }
 

Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h

@@ -33,8 +33,8 @@ namespace O3DE::ProjectManager
         void AddGem(const GemInfo& gemInfo);
         void Clear();
 
-        QModelIndex FindIndexByUuidString(const QString& uuidString) const;
-        void FindGemNamesByUuidStrings(QStringList& inOutGemNames);
+        QModelIndex FindIndexByNameString(const QString& nameString) const;
+        void FindGemNamesByNameStrings(QStringList& inOutGemNames);
         QStringList GetDependingGemUuids(const QModelIndex& modelIndex);
         QStringList GetDependingGemNames(const QModelIndex& modelIndex);
         QStringList GetConflictingGemUuids(const QModelIndex& modelIndex);
@@ -43,7 +43,6 @@ namespace O3DE::ProjectManager
         static QString GetName(const QModelIndex& modelIndex);
         static QString GetCreator(const QModelIndex& modelIndex);
         static GemInfo::GemOrigin GetGemOrigin(const QModelIndex& modelIndex);
-        static QString GetUuidString(const QModelIndex& modelIndex);
         static GemInfo::Platforms GetPlatforms(const QModelIndex& modelIndex);
         static GemInfo::Types GetTypes(const QModelIndex& modelIndex);
         static QString GetSummary(const QModelIndex& modelIndex);
@@ -59,7 +58,6 @@ namespace O3DE::ProjectManager
         enum UserRole
         {
             RoleName = Qt::UserRole,
-            RoleUuid,
             RoleCreator,
             RoleGemOrigin,
             RolePlatforms,
@@ -76,7 +74,7 @@ namespace O3DE::ProjectManager
             RoleTypes
         };
 
-        QHash<QString, QModelIndex> m_uuidToIndexMap;
+        QHash<QString, QModelIndex> m_nameToIndexMap;
         QItemSelectionModel* m_selectionModel = nullptr;
     };
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/PythonBindings.cpp

@@ -283,9 +283,11 @@ namespace O3DE::ProjectManager
             AZ_Warning("ProjectManagerWindow", result != -1, "Append to sys path failed");
 
             // import required modules
-            m_register= pybind11::module::import("o3de.register");
+            m_register = pybind11::module::import("o3de.register");
             m_manifest = pybind11::module::import("o3de.manifest");
             m_engineTemplate = pybind11::module::import("o3de.engine_template");
+            m_addGemProject = pybind11::module::import("o3de.add_gem_project");
+            m_removeGemProject = pybind11::module::import("o3de.remove_gem_project");
 
             return result == 0 && !PyErr_Occurred();
         } catch ([[maybe_unused]] const std::exception& e)
@@ -331,26 +333,26 @@ namespace O3DE::ProjectManager
     {
         EngineInfo engineInfo;
         bool result = ExecuteWithLock([&] {
-            pybind11::str enginePath = m_registration.attr("get_this_engine_path")();
+            pybind11::str enginePath = m_manifest.attr("get_this_engine_path")();
 
-            auto o3deData = m_registration.attr("load_o3de_manifest")();
+            auto o3deData = m_manifest.attr("load_o3de_manifest")();
             if (pybind11::isinstance<pybind11::dict>(o3deData))
             {
-                engineInfo.m_path                    = Py_To_String(enginePath); 
-                engineInfo.m_defaultGemsFolder       = Py_To_String(o3deData["default_gems_folder"]); 
-                engineInfo.m_defaultProjectsFolder   = Py_To_String(o3deData["default_projects_folder"]); 
-                engineInfo.m_defaultRestrictedFolder = Py_To_String(o3deData["default_restricted_folder"]); 
-                engineInfo.m_defaultTemplatesFolder  = Py_To_String(o3deData["default_templates_folder"]); 
-                engineInfo.m_thirdPartyPath          = Py_To_String_Optional(o3deData,"third_party_path",""); 
+                engineInfo.m_path                    = Py_To_String(enginePath);
+                engineInfo.m_defaultGemsFolder       = Py_To_String(o3deData["default_gems_folder"]);
+                engineInfo.m_defaultProjectsFolder   = Py_To_String(o3deData["default_projects_folder"]);
+                engineInfo.m_defaultRestrictedFolder = Py_To_String(o3deData["default_restricted_folder"]);
+                engineInfo.m_defaultTemplatesFolder  = Py_To_String(o3deData["default_templates_folder"]);
+                engineInfo.m_thirdPartyPath          = Py_To_String_Optional(o3deData,"third_party_path","");
             }
 
-            auto engineData = m_registration.attr("get_engine_json_data")(pybind11::none(), enginePath);
+            auto engineData = m_manifest.attr("get_engine_json_data")(pybind11::none(), enginePath);
             if (pybind11::isinstance<pybind11::dict>(engineData))
             {
                 try
                 {
-                    engineInfo.m_version = Py_To_String_Optional(engineData,"O3DEVersion","0.0.0.0"); 
-                    engineInfo.m_name    = Py_To_String_Optional(engineData,"engine_name","O3DE"); 
+                    engineInfo.m_version = Py_To_String_Optional(engineData,"O3DEVersion","0.0.0.0");
+                    engineInfo.m_name    = Py_To_String_Optional(engineData,"engine_name","O3DE");
                 }
                 catch ([[maybe_unused]] const std::exception& e)
                 {
@@ -365,13 +367,13 @@ namespace O3DE::ProjectManager
         }
         else
         {
-            return AZ::Success(AZStd::move(engineInfo)); 
+            return AZ::Success(AZStd::move(engineInfo));
         }
 
         return AZ::Failure();
     }
 
-    bool PythonBindings::SetEngineInfo(const EngineInfo& engineInfo)  
+    bool PythonBindings::SetEngineInfo(const EngineInfo& engineInfo)
     {
         bool result = ExecuteWithLock([&] {
             pybind11::str enginePath             = engineInfo.m_path.toStdString();
@@ -379,17 +381,17 @@ namespace O3DE::ProjectManager
             pybind11::str defaultGemsFolder      = engineInfo.m_defaultGemsFolder.toStdString();
             pybind11::str defaultTemplatesFolder = engineInfo.m_defaultTemplatesFolder.toStdString();
 
-            auto registrationResult = m_registration.attr("register")(
-                enginePath,       // engine_path 
-                pybind11::none(), // project_path 
-                pybind11::none(), // gem_path 
-                pybind11::none(), // template_path 
-                pybind11::none(), // restricted_path 
-                pybind11::none(), // repo_uri 
+            auto registrationResult = m_register.attr("register")(
+                enginePath,       // engine_path
+                pybind11::none(), // project_path
+                pybind11::none(), // gem_path
+                pybind11::none(), // template_path
+                pybind11::none(), // restricted_path
+                pybind11::none(), // repo_uri
                 pybind11::none(), // default_engines_folder
                 defaultProjectsFolder,
-                defaultGemsFolder, 
-                defaultTemplatesFolder 
+                defaultGemsFolder,
+                defaultTemplatesFolder
                 );
 
             if (registrationResult.cast<int>() != 0)
@@ -397,13 +399,13 @@ namespace O3DE::ProjectManager
                 result = false;
             }
 
-            auto manifest = m_registration.attr("load_o3de_manifest")();
+            auto manifest = m_manifest.attr("load_o3de_manifest")();
             if (pybind11::isinstance<pybind11::dict>(manifest))
             {
                 try
                 {
                     manifest["third_party_path"] = engineInfo.m_thirdPartyPath.toStdString();
-                    m_registration.attr("save_o3de_manifest")(manifest);
+                    m_manifest.attr("save_o3de_manifest")(manifest);
                 }
                 catch ([[maybe_unused]] const std::exception& e)
                 {
@@ -435,13 +437,13 @@ namespace O3DE::ProjectManager
 
         bool result = ExecuteWithLock([&] {
             // external gems
-            for (auto path : m_registration.attr("get_gems")())
+            for (auto path : m_manifest.attr("get_gems")())
             {
                 gems.push_back(GemInfoFromPath(path));
             }
 
             // gems from the engine
-            for (auto path : m_registration.attr("get_engine_gems")())
+            for (auto path : m_manifest.attr("get_engine_gems")())
             {
                 gems.push_back(GemInfoFromPath(path));
             }
@@ -457,7 +459,7 @@ namespace O3DE::ProjectManager
         }
     }
 
-    AZ::Outcome<ProjectInfo> PythonBindings::CreateProject(const QString& projectTemplatePath, const ProjectInfo& projectInfo)  
+    AZ::Outcome<ProjectInfo> PythonBindings::CreateProject(const QString& projectTemplatePath, const ProjectInfo& projectInfo)
     {
         ProjectInfo createdProjectInfo;
         bool result = ExecuteWithLock([&] {
@@ -477,7 +479,7 @@ namespace O3DE::ProjectManager
         }
         else
         {
-            return AZ::Success(AZStd::move(createdProjectInfo)); 
+            return AZ::Success(AZStd::move(createdProjectInfo));
         }
     }
 
@@ -499,7 +501,7 @@ namespace O3DE::ProjectManager
         GemInfo gemInfo;
         gemInfo.m_path = Py_To_String(path);
 
-        auto data = m_registration.attr("get_gem_json_data")(pybind11::none(), path);
+        auto data = m_manifest.attr("get_gem_json_data")(pybind11::none(), path);
         if (pybind11::isinstance<pybind11::dict>(data))
         {
             try
@@ -512,14 +514,6 @@ namespace O3DE::ProjectManager
                 gemInfo.m_summary     = Py_To_String_Optional(data, "Summary", "");
                 gemInfo.m_version     = Py_To_String_Optional(data, "Version", "");
 
-                if (data.contains("Dependencies"))
-                {
-                    for (auto dependency : data["Dependencies"])
-                    {
-                        const AZ::Uuid uuid = Py_To_String(dependency["Uuid"]);
-                        gemInfo.m_dependingGemUuids.push_back(uuid.ToString<AZStd::string>().c_str());
-                    }
-                }
                 if (data.contains("Tags"))
                 {
                     for (auto tag : data["Tags"])
@@ -543,13 +537,13 @@ namespace O3DE::ProjectManager
         projectInfo.m_path = Py_To_String(path);
         projectInfo.m_isNew = false;
 
-        auto projectData = m_registration.attr("get_project_json_data")(pybind11::none(), path);
+        auto projectData = m_manifest.attr("get_project_json_data")(pybind11::none(), path);
         if (pybind11::isinstance<pybind11::dict>(projectData))
         {
             try
             {
                 projectInfo.m_projectName = Py_To_String(projectData["project_name"]);
-                projectInfo.m_displayName = Py_To_String_Optional(projectData,"display_name", projectInfo.m_projectName); 
+                projectInfo.m_displayName = Py_To_String_Optional(projectData,"display_name", projectInfo.m_projectName);
             }
             catch ([[maybe_unused]] const std::exception& e)
             {
@@ -566,13 +560,13 @@ namespace O3DE::ProjectManager
 
         bool result = ExecuteWithLock([&] {
             // external projects
-            for (auto path : m_registration.attr("get_projects")())
+            for (auto path : m_manifest.attr("get_projects")())
             {
                 projects.push_back(ProjectInfoFromPath(path));
             }
 
             // projects from the engine
-            for (auto path : m_registration.attr("get_engine_projects")())
+            for (auto path : m_manifest.attr("get_engine_projects")())
             {
                 projects.push_back(ProjectInfoFromPath(path));
             }
@@ -594,7 +588,7 @@ namespace O3DE::ProjectManager
             pybind11::str pyGemPath     = gemPath.toStdString();
             pybind11::str pyProjectPath = projectPath.toStdString();
 
-            m_registration.attr("add_gem_to_project")(
+            m_addGemProject.attr("add_gem_to_project")(
                 pybind11::none(), // gem_name
                 pyGemPath,
                 pybind11::none(), // gem_target
@@ -612,7 +606,7 @@ namespace O3DE::ProjectManager
             pybind11::str pyGemPath     = gemPath.toStdString();
             pybind11::str pyProjectPath = projectPath.toStdString();
 
-            m_registration.attr("remove_gem_to_project")(
+            m_removeGemProject.attr("remove_gem_from_project")(
                 pybind11::none(), // gem_name
                 pyGemPath,
                 pybind11::none(), // gem_target
@@ -634,7 +628,7 @@ namespace O3DE::ProjectManager
         ProjectTemplateInfo templateInfo;
         templateInfo.m_path = Py_To_String(path);
 
-        auto data = m_registration.attr("get_template_json_data")(pybind11::none(), path);
+        auto data = m_manifest.attr("get_template_json_data")(pybind11::none(), path);
         if (pybind11::isinstance<pybind11::dict>(data))
         {
             try
@@ -674,7 +668,7 @@ namespace O3DE::ProjectManager
         QVector<ProjectTemplateInfo> templates;
 
         bool result = ExecuteWithLock([&] {
-            for (auto path : m_registration.attr("get_project_templates")())
+            for (auto path : m_manifest.attr("get_project_templates")())
             {
                 templates.push_back(ProjectTemplateInfoFromPath(path));
             }

Code/Tools/ProjectManager/Source/PythonBindings.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #include <PythonBindingsInterface.h>
-#include <AzCore/IO/Path/Path.h> 
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/std/parallel/semaphore.h>
 
 // Qt defines slots, which interferes with the use here.
@@ -25,7 +25,7 @@
 
 namespace O3DE::ProjectManager
 {
-    class PythonBindings 
+    class PythonBindings
         : public PythonBindingsInterface::Registrar
     {
     public:
@@ -66,6 +66,9 @@ namespace O3DE::ProjectManager
         AZ::IO::FixedMaxPath m_enginePath;
         pybind11::handle m_engineTemplate;
         AZStd::recursive_mutex m_lock;
-        pybind11::handle m_registration;
+        pybind11::handle m_register;
+        pybind11::handle m_manifest;
+        pybind11::handle m_addGemProject;
+        pybind11::handle m_removeGemProject;
     };
 }

scripts/o3de/o3de/manifest.py

@@ -322,6 +322,29 @@ def get_all_templates() -> list:
     templates_data.extend(engine_templates)
     return templates_data
 
+def get_project_templates():  # temporary until we have a better way to do this... maybe template_type element
+    project_templates = []
+    for template in get_all_templates():
+        if 'Project' in template:
+            project_templates.append(template)
+    return project_templates
+
+
+def get_gem_templates():  # temporary until we have a better way to do this... maybe template_type element
+    gem_templates = []
+    for template in get_all_templates():
+        if 'Gem' in template:
+            gem_templates.append(template)
+    return gem_templates
+
+
+def get_generic_templates():  # temporary until we have a better way to do this... maybe template_type element
+    generic_templates = []
+    for template in get_all_templates():
+        if 'Project' not in template and  'Gem' not in template:
+            generic_templates.append(template)
+    return generic_templates
+
 
 def get_all_restricted() -> list:
     engine_restricted = get_engine_restricted()

scripts/project_manager/projects.py

@@ -29,10 +29,10 @@ executable_path = ''
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
 
-from o3de import engine_template, registration
+from o3de import add_gem_project, cmake, engine_template, manifest, register, remove_gem_project
 
-o3de_folder = registration.get_o3de_folder()
-o3de_logs_folder = registration.get_o3de_logs_folder()
+o3de_folder = manifest.get_o3de_folder()
+o3de_logs_folder = manifest.get_o3de_logs_folder()
 project_manager_log_file_path = o3de_logs_folder / "project_manager.log"
 log_file_handler = RotatingFileHandler(filename=project_manager_log_file_path, maxBytes=1024 * 1024, backupCount=1)
 formatter = logging.Formatter('%(asctime)s | %(levelname)s : %(message)s')
@@ -123,7 +123,7 @@ class ProjectManagerDialog(QObject):
         super(ProjectManagerDialog, self).__init__(parent)
 
         self.ui_path = (pathlib.Path(__file__).parent / 'ui').resolve()
-        self.home_folder = registration.get_home_folder()
+        self.home_folder = manifest.get_home_folder()
 
         self.log_display = None
         self.dialog_logger = DialogLogger(self)
@@ -201,7 +201,7 @@ class ProjectManagerDialog(QObject):
         self.dialog.show()
 
     def refresh_project_list(self) -> None:
-        projects = registration.get_all_projects()
+        projects = manifest.get_all_projects()
         self.project_list_box.clear()
         for this_slot in range(len(projects)):
             display_name = f'{os.path.basename(os.path.normpath(projects[this_slot]))}  ({projects[this_slot]})'
@@ -255,7 +255,7 @@ class ProjectManagerDialog(QObject):
         return self.project_list_box.itemData(self.project_list_box.currentIndex(), Qt.ToolTipRole)
 
     def get_selected_project_name(self) -> str:
-        project_data = registration.get_project_data(project_path=self.get_selected_project_path())
+        project_data = manifest.get_project_json_data(project_path=self.get_selected_project_path())
         return project_data['project_name']
 
     def create_project_handler(self):
@@ -297,7 +297,7 @@ class ProjectManagerDialog(QObject):
             return
 
         folder_dialog = QFileDialog(self.dialog, "Select a Folder and Enter a New Project Name",
-                                    registration.get_o3de_projects_folder().as_posix())
+                                    manifest.get_o3de_projects_folder().as_posix())
         folder_dialog.setFileMode(QFileDialog.AnyFile)
         folder_dialog.setOptions(QFileDialog.ShowDirsOnly)
         project_count = 0
@@ -313,7 +313,7 @@ class ProjectManagerDialog(QObject):
             if engine_template.create_project(project_path=project_folder[0],
                                               template_path=project_template_path) == 0:
                 # Success
-                registration.register(project_path=project_folder[0])
+                register.register(project_path=project_folder[0])
                 self.refresh_project_list()
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -359,7 +359,7 @@ class ProjectManagerDialog(QObject):
             return
 
         folder_dialog = QFileDialog(self.dialog, "Select a Folder and Enter a New Gem Name",
-                                    registration.get_o3de_gems_folder().as_posix())
+                                    manifest.get_o3de_gems_folder().as_posix())
         folder_dialog.setFileMode(QFileDialog.AnyFile)
         folder_dialog.setOptions(QFileDialog.ShowDirsOnly)
         gem_count = 0
@@ -375,7 +375,7 @@ class ProjectManagerDialog(QObject):
             if engine_template.create_gem(gem_path=gem_folder[0],
                                           template_path=gem_template_path) == 0:
                 # Success
-                registration.register(gem_path=gem_folder[0])
+                register.register(gem_path=gem_folder[0])
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
                 msg_box.setText(f"Gem {gem_folder[0]} created.")
@@ -391,13 +391,13 @@ class ProjectManagerDialog(QObject):
 
         source_folder = QFileDialog.getExistingDirectory(self.dialog,
                                                          "Select a Folder to make a template out of.",
-                                                         registration.get_o3de_folder().as_posix())
+                                                         manifest.get_o3de_folder().as_posix())
         if not source_folder:
             return
 
         destination_template_folder_dialog = QFileDialog(self.dialog,
                                                          "Select where the template is to be created and named.",
-                                                         registration.get_o3de_templates_folder().as_posix())
+                                                         manifest.get_o3de_templates_folder().as_posix())
         destination_template_folder_dialog.setFileMode(QFileDialog.AnyFile)
         destination_template_folder_dialog.setOptions(QFileDialog.ShowDirsOnly)
         destination_folder = None
@@ -409,7 +409,7 @@ class ProjectManagerDialog(QObject):
         if engine_template.create_template(source_path=source_folder,
                                            template_path=destination_folder[0]) == 0:
             # Success
-            registration.register(template_path=destination_folder[0])
+            register.register(template_path=destination_folder[0])
             msg_box = QMessageBox(parent=self.dialog)
             msg_box.setWindowTitle("O3DE")
             msg_box.setText(f"Template {destination_folder[0]} created.")
@@ -453,7 +453,7 @@ class ProjectManagerDialog(QObject):
             return
 
         folder_dialog = QFileDialog(self.dialog, "Select a Folder and Enter a New Gem Name",
-                                    registration.get_o3de_gems_folder().as_posix())
+                                    manifest.get_o3de_gems_folder().as_posix())
         folder_dialog.setFileMode(QFileDialog.AnyFile)
         folder_dialog.setOptions(QFileDialog.ShowDirsOnly)
         gem_count = 0
@@ -482,9 +482,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         project_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Project Folder",
-                                                          registration.get_o3de_projects_folder().as_posix())
+                                                          manifest.get_o3de_projects_folder().as_posix())
         if project_folder:
-            if registration.register(project_path=project_folder) == 0:
+            if register.register(project_path=project_folder) == 0:
                 # Success
                 self.refresh_project_list()
 
@@ -501,9 +501,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         gem_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Gem Folder",
-                                                      registration.get_o3de_gems_folder().as_posix())
+                                                      manifest.get_o3de_gems_folder().as_posix())
         if gem_folder:
-            if registration.register(gem_path=gem_folder) == 0:
+            if register.register(gem_path=gem_folder) == 0:
                 # Success
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -518,9 +518,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         template_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Template Folder",
-                                                           registration.get_o3de_templates_folder().as_posix())
+                                                           manifest.get_o3de_templates_folder().as_posix())
         if template_folder:
-            if registration.register(template_path=template_folder) == 0:
+            if register.register(template_path=template_folder) == 0:
                 # Success
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -535,9 +535,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         restricted_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Restricted Folder",
-                                                             registration.get_o3de_restricted_folder().as_posix())
+                                                             manifest.get_o3de_restricted_folder().as_posix())
         if restricted_folder:
-            if registration.register(restricted_path=restricted_folder) == 0:
+            if register.register(restricted_path=restricted_folder) == 0:
                 # Success
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -552,9 +552,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         project_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Project Folder",
-                                                          registration.get_o3de_projects_folder().as_posix())
+                                                          manifest.get_o3de_projects_folder().as_posix())
         if project_folder:
-            if registration.register(project_path=project_folder, remove=True) == 0:
+            if register.register(project_path=project_folder, remove=True) == 0:
                 # Success
                 self.refresh_project_list()
 
@@ -571,9 +571,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         gem_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Gem Folder",
-                                                      registration.get_o3de_gems_folder().as_posix())
+                                                      manifest.get_o3de_gems_folder().as_posix())
         if gem_folder:
-            if registration.register(gem_path=gem_folder, remove=True) == 0:
+            if register.register(gem_path=gem_folder, remove=True) == 0:
                 # Success
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -588,9 +588,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         template_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Template Folder",
-                                                           registration.get_o3de_templates_folder().as_posix())
+                                                           manifest.get_o3de_templates_folder().as_posix())
         if template_folder:
-            if registration.register(template_path=template_folder, remove=True) == 0:
+            if register.register(template_path=template_folder, remove=True) == 0:
                 # Success
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -605,9 +605,9 @@ class ProjectManagerDialog(QObject):
         :return: None
         """
         restricted_folder = QFileDialog.getExistingDirectory(self.dialog, "Select Restricted Folder",
-                                                             registration.get_o3de_restricted_folder().as_posix())
+                                                             manifest.get_o3de_restricted_folder().as_posix())
         if restricted_folder:
-            if registration.register(restricted_path=restricted_folder, remove=True) == 0:
+            if register.register(restricted_path=restricted_folder, remove=True) == 0:
                 # Success
                 msg_box = QMessageBox(parent=self.dialog)
                 msg_box.setWindowTitle("O3DE")
@@ -767,13 +767,13 @@ class ProjectManagerDialog(QObject):
         return [(self.enabled_gem_targets_list.model().data(item)) for item in selected_items]
 
     def add_runtime_project_gem_targets_handler(self) -> None:
-        gem_paths = registration.get_all_gems()
+        gem_paths = manifest.get_all_gems()
         for gem_target in self.manage_project_gem_targets_get_selected_available_gems():
             for gem_path in gem_paths:
-                this_gems_targets = registration.get_gem_targets(gem_path=gem_path)
+                this_gems_targets = cmake.get_gem_targets(gem_path=gem_path)
                 for this_gem_target in this_gems_targets:
                     if gem_target == this_gem_target:
-                        registration.add_gem_to_project(gem_path=gem_path,
+                        add_gem_project.add_gem_to_project(gem_path=gem_path,
                                                         gem_target=gem_target,
                                                         project_path=self.get_selected_project_path(),
                                                         runtime_dependency=True)
@@ -784,13 +784,13 @@ class ProjectManagerDialog(QObject):
         self.refresh_runtime_project_gem_targets_enabled_list()
 
     def remove_runtime_project_gem_targets_handler(self):
-        gem_paths = registration.get_all_gems()
+        gem_paths = manifest.get_all_gems()
         for gem_target in self.manage_project_gem_targets_get_selected_enabled_gems():
             for gem_path in gem_paths:
-                this_gems_targets = registration.get_gem_targets(gem_path=gem_path)
+                this_gems_targets = cmake.get_gem_targets(gem_path=gem_path)
                 for this_gem_target in this_gems_targets:
                     if gem_target == this_gem_target:
-                        registration.remove_gem_from_project(gem_path=gem_path,
+                        remove_gem_project.remove_gem_from_project(gem_path=gem_path,
                                                              gem_target=gem_target,
                                                              project_path=self.get_selected_project_path(),
                                                              runtime_dependency=True)
@@ -801,13 +801,13 @@ class ProjectManagerDialog(QObject):
         self.refresh_runtime_project_gem_targets_enabled_list()
 
     def add_tool_project_gem_targets_handler(self) -> None:
-        gem_paths = registration.get_all_gems()
+        gem_paths = manifest.get_all_gems()
         for gem_target in self.manage_project_gem_targets_get_selected_available_gems():
             for gem_path in gem_paths:
-                this_gems_targets = registration.get_gem_targets(gem_path=gem_path)
+                this_gems_targets = cmake.get_gem_targets(gem_path=gem_path)
                 for this_gem_target in this_gems_targets:
                     if gem_target == this_gem_target:
-                        registration.add_gem_to_project(gem_path=gem_path,
+                        add_gem_project.add_gem_to_project(gem_path=gem_path,
                                                         gem_target=gem_target,
                                                         project_path=self.get_selected_project_path(),
                                                         tool_dependency=True)
@@ -818,13 +818,13 @@ class ProjectManagerDialog(QObject):
         self.refresh_tool_project_gem_targets_enabled_list()
 
     def remove_tool_project_gem_targets_handler(self):
-        gem_paths = registration.get_all_gems()
+        gem_paths = manifest.get_all_gems()
         for gem_target in self.manage_project_gem_targets_get_selected_enabled_gems():
             for gem_path in gem_paths:
-                this_gems_targets = registration.get_gem_targets(gem_path=gem_path)
+                this_gems_targets = cmake.get_gem_targets(gem_path=gem_path)
                 for this_gem_target in this_gems_targets:
                     if gem_target == this_gem_target:
-                        registration.remove_gem_from_project(gem_path=gem_path,
+                        remove_gem_project.remove_gem_from_project(gem_path=gem_path,
                                                              gem_target=gem_target,
                                                              project_path=self.get_selected_project_path(),
                                                              tool_dependency=True)
@@ -835,13 +835,13 @@ class ProjectManagerDialog(QObject):
         self.refresh_tool_project_gem_targets_enabled_list()
         
     def add_server_project_gem_targets_handler(self) -> None:
-        gem_paths = registration.get_all_gems()
+        gem_paths = manifest.get_all_gems()
         for gem_target in self.manage_project_gem_targets_get_selected_available_gems():
             for gem_path in gem_paths:
-                this_gems_targets = registration.get_gem_targets(gem_path=gem_path)
+                this_gems_targets = cmake.get_gem_targets(gem_path=gem_path)
                 for this_gem_target in this_gems_targets:
                     if gem_target == this_gem_target:
-                        registration.add_gem_to_project(gem_path=gem_path,
+                        add_gem_project.add_gem_to_project(gem_path=gem_path,
                                                         gem_target=gem_target,
                                                         project_path=self.get_selected_project_path(),
                                                         server_dependency=True)
@@ -852,13 +852,13 @@ class ProjectManagerDialog(QObject):
         self.refresh_server_project_gem_targets_enabled_list()
 
     def remove_server_project_gem_targets_handler(self):
-        gem_paths = registration.get_all_gems()
+        gem_paths = manifest.get_all_gems()
         for gem_target in self.manage_project_gem_targets_get_selected_enabled_gems():
             for gem_path in gem_paths:
-                this_gems_targets = registration.get_gem_targets(gem_path=gem_path)
+                this_gems_targets = cmake.get_gem_targets(gem_path=gem_path)
                 for this_gem_target in this_gems_targets:
                     if gem_target == this_gem_target:
-                        registration.remove_gem_from_project(gem_path=gem_path,
+                        remove_gem_project.remove_gem_from_project(gem_path=gem_path,
                                                              gem_target=gem_target,
                                                              project_path=self.get_selected_project_path(),
                                                              server_dependency=True)
@@ -870,7 +870,7 @@ class ProjectManagerDialog(QObject):
 
     def refresh_runtime_project_gem_targets_enabled_list(self) -> None:
         enabled_project_gem_targets_model = QStandardItemModel()
-        enabled_project_gem_targets = registration.get_project_runtime_gem_targets(
+        enabled_project_gem_targets = cmake.get_project_runtime_gem_targets(
             project_path=self.get_selected_project_path())
         for gem_target in sorted(enabled_project_gem_targets):
             model_item = QStandardItem(gem_target)
@@ -879,9 +879,9 @@ class ProjectManagerDialog(QObject):
 
     def refresh_runtime_project_gem_targets_available_list(self) -> None:
         available_project_gem_targets_model = QStandardItemModel()
-        enabled_project_gem_targets = registration.get_project_runtime_gem_targets(
+        enabled_project_gem_targets = cmake.get_project_runtime_gem_targets(
             project_path=self.get_selected_project_path())
-        all_gem_targets = registration.get_all_gem_targets()
+        all_gem_targets = cmake.get_all_gem_targets()
         for gem_target in sorted(all_gem_targets):
             if gem_target not in enabled_project_gem_targets:
                 model_item = QStandardItem(gem_target)
@@ -890,7 +890,7 @@ class ProjectManagerDialog(QObject):
         
     def refresh_tool_project_gem_targets_enabled_list(self) -> None:
         enabled_project_gem_targets_model = QStandardItemModel()
-        enabled_project_gem_targets = registration.get_project_tool_gem_targets(
+        enabled_project_gem_targets = cmake.get_project_tool_gem_targets(
             project_path=self.get_selected_project_path())
         for gem_target in sorted(enabled_project_gem_targets):
             model_item = QStandardItem(gem_target)
@@ -899,9 +899,9 @@ class ProjectManagerDialog(QObject):
 
     def refresh_tool_project_gem_targets_available_list(self) -> None:
         available_project_gem_targets_model = QStandardItemModel()
-        enabled_project_gem_targets = registration.get_project_tool_gem_targets(
+        enabled_project_gem_targets = cmake.get_project_tool_gem_targets(
             project_path=self.get_selected_project_path())
-        all_gem_targets = registration.get_all_gem_targets()
+        all_gem_targets = cmake.get_all_gem_targets()
         for gem_target in sorted(all_gem_targets):
             if gem_target not in enabled_project_gem_targets:
                 model_item = QStandardItem(gem_target)
@@ -910,7 +910,7 @@ class ProjectManagerDialog(QObject):
         
     def refresh_server_project_gem_targets_enabled_list(self) -> None:
         enabled_project_gem_targets_model = QStandardItemModel()
-        enabled_project_gem_targets = registration.get_project_server_gem_targets(
+        enabled_project_gem_targets = cmake.get_project_server_gem_targets(
             project_path=self.get_selected_project_path())
         for gem_target in sorted(enabled_project_gem_targets):
             model_item = QStandardItem(gem_target)
@@ -919,9 +919,9 @@ class ProjectManagerDialog(QObject):
 
     def refresh_server_project_gem_targets_available_list(self) -> None:
         available_project_gem_targets_model = QStandardItemModel()
-        enabled_project_gem_targets = registration.get_project_server_gem_targets(
+        enabled_project_gem_targets = cmake.get_project_server_gem_targets(
             project_path=self.get_selected_project_path())
-        all_gem_targets = registration.get_all_gem_targets()
+        all_gem_targets = cmake.get_all_gem_targets()
         for gem_target in sorted(all_gem_targets):
             if gem_target not in enabled_project_gem_targets:
                 model_item = QStandardItem(gem_target)
@@ -930,21 +930,21 @@ class ProjectManagerDialog(QObject):
 
     def refresh_create_project_template_list(self) -> None:
         self.create_project_template_model = QStandardItemModel()
-        for project_template_path in registration.get_project_templates():
+        for project_template_path in manifest.get_project_templates():
             model_item = QStandardItem(project_template_path)
             self.create_project_template_model.appendRow(model_item)
         self.create_project_template_list.setModel(self.create_project_template_model)
 
     def refresh_create_gem_template_list(self) -> None:
         self.create_gem_template_model = QStandardItemModel()
-        for gem_template_path in registration.get_gem_templates():
+        for gem_template_path in manifest.get_gem_templates():
             model_item = QStandardItem(gem_template_path)
             self.create_gem_template_model.appendRow(model_item)
         self.create_gem_template_list.setModel(self.create_gem_template_model)
 
     def refresh_create_from_template_list(self) -> None:
         self.create_from_template_model = QStandardItemModel()
-        for generic_template_path in registration.get_generic_templates():
+        for generic_template_path in manifest.get_generic_templates():
             model_item = QStandardItem(generic_template_path)
             self.create_from_template_model.appendRow(model_item)
         self.create_from_template_list.setModel(self.create_from_template_model)