Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/max context length #1370

Merged
merged 15 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions engine/config/gguf_parser.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <algorithm>
#include <cstdint>
#include <cstring>
#include <ctime>
Expand All @@ -12,6 +13,7 @@
#ifdef _WIN32
#include <io.h>
#include <windows.h>
#include <limits>
#else
#include <sys/mman.h> // For memory-mapped file
#include <unistd.h> // For file descriptors
Expand All @@ -25,6 +27,9 @@
#include "trantor/utils/Logger.h"

namespace config {
#define NOMINMAX
constexpr int kDefaultMaxContextLength = 8192;

void GGUFHandler::OpenFile(const std::string& file_path) {
#ifdef _WIN32
HANDLE file_handle_ = INVALID_HANDLE_VALUE;
Expand Down Expand Up @@ -582,8 +587,8 @@ void GGUFHandler::ModelConfigFromMetadata() {
model_config_.model = name;
model_config_.id = name;
model_config_.version = std::to_string(version);
model_config_.max_tokens = max_tokens;
model_config_.ctx_len = max_tokens;
model_config_.max_tokens = std::min<int>(kDefaultMaxContextLength, max_tokens);
model_config_.ctx_len = std::min<int>(kDefaultMaxContextLength, max_tokens);
model_config_.ngl = ngl;
}

Expand Down
7 changes: 3 additions & 4 deletions engine/services/download_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ cpp::result<void, std::string> DownloadService::AddDownloadTask(
}
}
if (dl_err_msg.has_value()) {
CTL_ERR(dl_err_msg.value());
// CTL_ERR(dl_err_msg.value());
return cpp::fail(dl_err_msg.value());
}

Expand Down Expand Up @@ -183,7 +183,7 @@ cpp::result<void, std::string> DownloadService::Download(
CLI_LOG("Resuming download..");
} else {
CLI_LOG("Start over..");
return {};
return cpp::fail("Cancelled Resume download!");
}
} else {
CLI_LOG(download_item.localPath.filename().string()
Expand All @@ -195,7 +195,7 @@ cpp::result<void, std::string> DownloadService::Download(
if (answer == "Y" || answer == "y" || answer.empty()) {
CLI_LOG("Re-downloading..");
} else {
return {};
return cpp::fail("Cancelled Re-download!");
}
}
}
Expand Down Expand Up @@ -232,7 +232,6 @@ cpp::result<void, std::string> DownloadService::Download(

fclose(file);
curl_easy_cleanup(curl);
CLI_LOG("Model " << download_id << " downloaded successfully!")
return {};
}

Expand Down
6 changes: 3 additions & 3 deletions engine/services/download_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ class DownloadService {
cpp::result<void, std::string> VerifyDownloadTask(
DownloadTask& task) const noexcept;

cpp::result<void, std::string> Download(const std::string& download_id,
const DownloadItem& download_item,
bool allow_resume) noexcept;
cpp::result<void, std::string> Download(
const std::string& download_id, const DownloadItem& download_item,
bool allow_resume) noexcept;

curl_off_t GetLocalFileSize(const std::filesystem::path& path) const;
};
6 changes: 5 additions & 1 deletion engine/services/model_service.cc
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,10 @@ cpp::result<std::string, std::string> ModelService::HandleUrl(
} else {
auto result = download_service_.AddDownloadTask(downloadTask, on_finished);
if (result.has_error()) {
CTL_ERR(result.error());
// CTL_ERR(result.error());
return cpp::fail(result.error());
} else {
CLI_LOG("Model " << model_id << " downloaded successfully!")
}
return unique_model_id;
}
Expand Down Expand Up @@ -292,6 +294,8 @@ cpp::result<std::string, std::string> ModelService::DownloadModelFromCortexso(

if (result.has_error()) {
return cpp::fail(result.error());
} else {
CLI_LOG("Model " << model_id << " downloaded successfully!")
}

return model_id;
Expand Down
Loading