feat: Consolidate AI agent build flags and enhance JSON support handling
This commit is contained in:
@@ -119,6 +119,22 @@ endif()
|
||||
if(YAZE_WITH_JSON)
|
||||
target_link_libraries(yaze_agent PUBLIC nlohmann_json::nlohmann_json)
|
||||
target_compile_definitions(yaze_agent PUBLIC YAZE_WITH_JSON)
|
||||
|
||||
find_package(OpenSSL)
|
||||
if(OpenSSL_FOUND)
|
||||
target_compile_definitions(yaze_agent PUBLIC CPPHTTPLIB_OPENSSL_SUPPORT)
|
||||
target_link_libraries(yaze_agent PUBLIC OpenSSL::SSL OpenSSL::Crypto)
|
||||
|
||||
if(APPLE)
|
||||
target_compile_definitions(yaze_agent PUBLIC CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN)
|
||||
target_link_libraries(yaze_agent PUBLIC "-framework CoreFoundation" "-framework Security")
|
||||
endif()
|
||||
|
||||
message(STATUS "✓ SSL/HTTPS support enabled for yaze_agent (Gemini + HTTPS)")
|
||||
else()
|
||||
message(WARNING "OpenSSL not found - Gemini HTTPS features disabled")
|
||||
message(STATUS " Install OpenSSL to enable Gemini: brew install openssl (macOS) or apt-get install libssl-dev (Linux)")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
set_target_properties(yaze_agent PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
@@ -7,26 +7,9 @@
|
||||
#include "absl/strings/str_format.h"
|
||||
#include "cli/service/agent/conversational_agent_service.h"
|
||||
|
||||
// Check if we have httplib available (from vcpkg or bundled)
|
||||
#if __has_include("httplib.h")
|
||||
#define YAZE_HAS_HTTPLIB 1
|
||||
#ifdef YAZE_WITH_JSON
|
||||
#include "httplib.h"
|
||||
#elif __has_include("incl/httplib.h")
|
||||
#define YAZE_HAS_HTTPLIB 1
|
||||
#include "incl/httplib.h"
|
||||
#else
|
||||
#define YAZE_HAS_HTTPLIB 0
|
||||
#endif
|
||||
|
||||
// Check if we have JSON library available
|
||||
#if __has_include("third_party/json/src/json.hpp")
|
||||
#define YAZE_HAS_JSON 1
|
||||
#include "third_party/json/src/json.hpp"
|
||||
#elif __has_include("json.hpp")
|
||||
#define YAZE_HAS_JSON 1
|
||||
#include "json.hpp"
|
||||
#else
|
||||
#define YAZE_HAS_JSON 0
|
||||
#include "nlohmann/json.hpp"
|
||||
#endif
|
||||
|
||||
namespace yaze {
|
||||
@@ -60,10 +43,10 @@ void OllamaAIService::SetRomContext(Rom* rom) {
|
||||
}
|
||||
|
||||
absl::Status OllamaAIService::CheckAvailability() {
|
||||
#if !YAZE_HAS_HTTPLIB || !YAZE_HAS_JSON
|
||||
#ifndef YAZE_WITH_JSON
|
||||
return absl::UnimplementedError(
|
||||
"Ollama service requires httplib and JSON support. "
|
||||
"Install vcpkg dependencies or use bundled libraries.");
|
||||
"Ollama service requires JSON support. "
|
||||
"Build with -DZ3ED_AI=ON or -DYAZE_WITH_JSON=ON");
|
||||
#else
|
||||
try {
|
||||
httplib::Client cli(config_.base_url);
|
||||
|
||||
@@ -125,6 +125,13 @@ absl::StatusOr<std::string> PromptBuilder::ResolveCataloguePath(
|
||||
}
|
||||
|
||||
absl::Status PromptBuilder::LoadResourceCatalogue(const std::string& yaml_path) {
|
||||
#ifndef YAZE_WITH_JSON
|
||||
// Gracefully degrade if JSON support not available
|
||||
std::cerr << "⚠️ PromptBuilder requires JSON support for catalogue loading\n"
|
||||
<< " Build with -DZ3ED_AI=ON or -DYAZE_WITH_JSON=ON\n"
|
||||
<< " AI features will use basic prompts without tool definitions\n";
|
||||
return absl::OkStatus(); // Don't fail, just skip catalogue loading
|
||||
#else
|
||||
auto resolved_or = ResolveCataloguePath(yaml_path);
|
||||
if (!resolved_or.ok()) {
|
||||
ClearCatalogData();
|
||||
@@ -175,6 +182,7 @@ absl::Status PromptBuilder::LoadResourceCatalogue(const std::string& yaml_path)
|
||||
|
||||
catalogue_loaded_ = true;
|
||||
return absl::OkStatus();
|
||||
#endif // YAZE_WITH_JSON
|
||||
}
|
||||
|
||||
absl::Status PromptBuilder::ParseCommands(const nlohmann::json& commands) {
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
#ifndef YAZE_CLI_SERVICE_PROMPT_BUILDER_H_
|
||||
#define YAZE_CLI_SERVICE_PROMPT_BUILDER_H_
|
||||
|
||||
// PromptBuilder requires JSON and YAML support for catalogue loading
|
||||
// If you see linker errors, enable Z3ED_AI or YAZE_WITH_JSON in CMake
|
||||
#if !defined(YAZE_WITH_JSON)
|
||||
#warning "PromptBuilder requires JSON support. Build with -DZ3ED_AI=ON or -DYAZE_WITH_JSON=ON"
|
||||
#endif
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -78,16 +78,23 @@ add_executable(
|
||||
cli/service/testing/test_suite_writer.cc
|
||||
)
|
||||
|
||||
if(YAZE_WITH_JSON)
|
||||
# ============================================================================
|
||||
# AI Agent Support (Consolidated via Z3ED_AI flag)
|
||||
# ============================================================================
|
||||
if(Z3ED_AI OR YAZE_WITH_JSON)
|
||||
target_compile_definitions(z3ed PRIVATE YAZE_WITH_JSON)
|
||||
message(STATUS "✓ z3ed AI agent enabled (Ollama + Gemini support)")
|
||||
|
||||
# Link nlohmann_json (already fetched in main CMakeLists if YAZE_WITH_JSON)
|
||||
target_link_libraries(z3ed PRIVATE nlohmann_json::nlohmann_json)
|
||||
endif()
|
||||
|
||||
# ============================================================================
|
||||
# SSL/HTTPS Support (Optional - Required for Gemini API and collaborative features)
|
||||
# SSL/HTTPS Support (Optional - Required for Gemini API)
|
||||
# ============================================================================
|
||||
# SSL is only enabled when building with gRPC+JSON (the full agent/testing suite)
|
||||
# This ensures Windows builds without these dependencies still work
|
||||
if(YAZE_WITH_GRPC AND YAZE_WITH_JSON)
|
||||
# SSL is only enabled when AI features are active
|
||||
# Ollama (localhost) works without SSL, Gemini (HTTPS) requires it
|
||||
if((Z3ED_AI OR YAZE_WITH_JSON) AND (YAZE_WITH_GRPC OR Z3ED_AI))
|
||||
find_package(OpenSSL)
|
||||
|
||||
if(OpenSSL_FOUND)
|
||||
@@ -103,13 +110,16 @@ if(YAZE_WITH_GRPC AND YAZE_WITH_JSON)
|
||||
target_link_libraries(z3ed PRIVATE "-framework CoreFoundation" "-framework Security")
|
||||
endif()
|
||||
|
||||
message(STATUS "✓ SSL/HTTPS support enabled for z3ed (required for Gemini API)")
|
||||
message(STATUS "✓ SSL/HTTPS support enabled for z3ed (Gemini API ready)")
|
||||
else()
|
||||
message(WARNING "OpenSSL not found - Gemini API will not work (Ollama will still function)")
|
||||
message(STATUS " Install OpenSSL to enable Gemini: brew install openssl (macOS) or apt-get install libssl-dev (Linux)")
|
||||
message(WARNING "OpenSSL not found - Gemini API will not work")
|
||||
message(STATUS " • Ollama (local) still works without SSL")
|
||||
message(STATUS " • Install OpenSSL for Gemini: brew install openssl (macOS) or apt install libssl-dev (Linux)")
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Building z3ed without gRPC/JSON - AI agent features disabled")
|
||||
if(NOT Z3ED_AI AND NOT YAZE_WITH_JSON)
|
||||
message(STATUS "○ z3ed AI agent disabled (set -DZ3ED_AI=ON to enable Gemini/Ollama)")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
target_include_directories(
|
||||
|
||||
Reference in New Issue
Block a user