Merge branch 'main' of github.com:viamrobotics/viam-cpp-sdk into 20250514-RSDK-13982-construct-model-table

Author: nfranczak

.github/workflows/update-templates.yml

@@ -12,6 +12,11 @@ on:
       branch:
         required: true
         type: string
+      rdk_branch:
+        description: 'Branch of viamrobotics/rdk to check out for the generator'
+        required: false
+        type: string
+        default: main
 
 jobs:
   update_templates:
@@ -67,6 +72,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           repository: viamrobotics/rdk
+          ref: ${{ inputs.rdk_branch || 'main' }}
           path: rdk
 
       - name: Build and install generator

CMakeLists.txt

@@ -47,6 +47,16 @@ project(viam-cpp-sdk
   LANGUAGES CXX
 )
 
+# Detect if we're building as a standalone module
+# vs being included via FetchContent by a downstream consumer
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+  set(VIAMCPPSDK_STANDALONE_BUILD ON)
+  message(STATUS "viam-cpp-sdk: Standalone build mode")
+else()
+  set(VIAMCPPSDK_STANDALONE_BUILD OFF)
+  message(STATUS "viam-cpp-sdk: FetchContent mode (included by parent project)")
+endif()
+
 
 # Configure cmake-level options:
 
@@ -113,7 +123,7 @@ option(VIAMCPPSDK_USE_LOCAL_PROTOS "Generate protos against sibling `api` direct
 # This causes the SDK's internal code to compile with `-Wall` and
 # `-Werror` flags.
 #
-option(VIAMCPPSDK_USE_WALL_WERROR "Build with -Wall and -Werror flags" ON)
+option(VIAMCPPSDK_USE_WALL_WERROR "Build with -Wall and -Werror flags" ${VIAMCPPSDK_STANDALONE_BUILD})
 
 
 # - `VIAMCPPSDK_SANITIZED_BUILD`
@@ -141,11 +151,15 @@ option(VIAMCPPSDK_CLANG_TIDY "Run the clang-tidy linter" OFF)
 #
 option(VIAMCPPSDK_OPENTELEMETRY_TRACING "Compile OpenTelemetry tracing into all gRPC calls" OFF)
 
-# The following options are only defined if this project is not being included as a subproject
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  option(VIAMCPPSDK_BUILD_EXAMPLES "Build the example executables" ON)
-  option(VIAMCPPSDK_BUILD_TESTS "Build the example executables" ON)
-endif()
+# - `VIAMCPPSDK_BUILD_EXAMPLES `
+#
+# Defaults to ON for standalone builds, OFF for FetchContent consumers.
+option(VIAMCPPSDK_BUILD_EXAMPLES "Build the example executables" ${VIAMCPPSDK_STANDALONE_BUILD})
+
+# - `VIAMCPPSDK_BUILD_TESTS `
+#
+# Defaults to ON for standalone builds, OFF for FetchContent consumers.
+option(VIAMCPPSDK_BUILD_TESTS "Build the example executables" ${VIAMCPPSDK_STANDALONE_BUILD})
 
 
 # Enforce known toolchains and toolchain minima unless asked not to.

res/module_generator/_templates/components/generic.cpp.in

@@ -7,7 +7,7 @@ namespace {{ .ModuleSnake }} {
 
 
 {{ .ModelPascal }}::{{ .ModelPascal }}(const viam::sdk::Dependencies& deps, const viam::sdk::ResourceConfig& cfg)
-    : Generic(cfg.name()) {
+    : GenericComponent(cfg.name()) {
     throw std::runtime_error("constructor not implemented");
 }
 
@@ -16,5 +16,20 @@ std::vector<std::string> {{ .ModelPascal }}::validate(const viam::sdk::ResourceC
     throw std::runtime_error("\"validate\" not implemented");
 }
 
+viam::sdk::ProtoStruct {{ .ModelPascal }}::do_command(const viam::sdk::ProtoStruct & command)
+{
+    throw std::logic_error("\"do_command\" not implemented");
+}
+
+viam::sdk::ProtoStruct {{ .ModelPascal }}::get_status()
+{
+    throw std::logic_error("\"get_status\" not implemented");
+}
+
+std::vector<viam::sdk::GeometryConfig> {{ .ModelPascal }}::get_geometries(const viam::sdk::ProtoStruct & extra)
+{
+    throw std::logic_error("\"get_geometries\" not implemented");
+}
+
 } // namespace {{ .ModuleSnake }}
 

res/module_generator/_templates/components/generic.hpp.in

@@ -9,12 +9,18 @@
 namespace {{ .ModuleSnake }} {
 
 
-class {{ .ModelPascal }} : public viam::sdk::Generic {
+class {{ .ModelPascal }} : public viam::sdk::GenericComponent {
 public:
     {{ .ModelPascal }}(const viam::sdk::Dependencies& deps, const viam::sdk::ResourceConfig& cfg);
 
     static std::vector<std::string> validate(const viam::sdk::ResourceConfig& cfg);
 
+    viam::sdk::ProtoStruct do_command(const viam::sdk::ProtoStruct & command) override;
+
+    viam::sdk::ProtoStruct get_status() override;
+
+    std::vector<viam::sdk::GeometryConfig> get_geometries(const viam::sdk::ProtoStruct & extra) override;
+
 };
 
 } // namespace {{ .ModuleSnake }}

res/module_generator/_templates/services/generic.cpp.in

@@ -7,7 +7,7 @@ namespace {{ .ModuleSnake }} {
 
 
 {{ .ModelPascal }}::{{ .ModelPascal }}(const viam::sdk::Dependencies& deps, const viam::sdk::ResourceConfig& cfg)
-    : Generic(cfg.name()) {
+    : GenericService(cfg.name()) {
     throw std::runtime_error("constructor not implemented");
 }
 
@@ -16,5 +16,15 @@ std::vector<std::string> {{ .ModelPascal }}::validate(const viam::sdk::ResourceC
     throw std::runtime_error("\"validate\" not implemented");
 }
 
+viam::sdk::ProtoStruct {{ .ModelPascal }}::do_command(const viam::sdk::ProtoStruct & command)
+{
+    throw std::logic_error("\"do_command\" not implemented");
+}
+
+viam::sdk::ProtoStruct {{ .ModelPascal }}::get_status()
+{
+    throw std::logic_error("\"get_status\" not implemented");
+}
+
 } // namespace {{ .ModuleSnake }}
 

res/module_generator/_templates/services/generic.hpp.in

@@ -9,12 +9,16 @@
 namespace {{ .ModuleSnake }} {
 
 
-class {{ .ModelPascal }} : public viam::sdk::Generic {
+class {{ .ModelPascal }} : public viam::sdk::GenericService {
 public:
     {{ .ModelPascal }}(const viam::sdk::Dependencies& deps, const viam::sdk::ResourceConfig& cfg);
 
     static std::vector<std::string> validate(const viam::sdk::ResourceConfig& cfg);
 
+    viam::sdk::ProtoStruct do_command(const viam::sdk::ProtoStruct & command) override;
+
+    viam::sdk::ProtoStruct get_status() override;
+
 };
 
 } // namespace {{ .ModuleSnake }}