Use fetch as a prefix rather than suffix

dspinellis · Mar 9, 2024 · b01e7a1 · b01e7a1
1 parent 0ddcaac
commit b01e7a1
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -228,7 +228,7 @@ Particular useful are:
 * multi-shot prompts for systems not yet supported
   (see the [ai-cli-config](src/ai-cli-config) file),
 * support for other large language models
-  (start from the [OpenAI_fetch.c](src/openai_fetch.c) file),
+  (start from the [openai_fetch.c](src/openai_fetch.c) file),
 * support for other libraries (mainly [editline](https://man.netbsd.org/editline.3)),
 * ports to other platforms and distributions.
 

diff --git a/src/Makefile b/src/Makefile
@@ -6,8 +6,8 @@ MANPREFIX ?= "$(PREFIX)/share/man/"
 SHAREPREFIX ?= "$(PREFIX)/share/ai-cli"
 
 PROGS=rl_driver $(SHARED_LIB)
-RL_SRC=ai_cli.c config.c ini.c anthropic_fetch.c openai_fetch.c \
-       llamacpp_fetch.c support.c
+RL_SRC=ai_cli.c config.c ini.c fetch_anthropic.c fetch_openai.c \
+       fetch_llamacpp.c support.c
 TEST_SRC=$(wildcard *_test.c)
 LIB=-lcurl -ljansson
 

diff --git a/src/ai_cli.c b/src/ai_cli.c
@@ -29,9 +29,9 @@
 
 #include "config.h"
 
-#include "anthropic_fetch.h"
-#include "llamacpp_fetch.h"
-#include "openai_fetch.h"
+#include "fetch_anthropic.h"
+#include "fetch_llamacpp.h"
+#include "fetch_openai.h"
 
 /*
  * Dynamically obtained pointer to readline(3) variables..
@@ -47,7 +47,7 @@ static int *history_length_ptr;
 // Loaded configuration
 static config_t config;
 
-// API fetch function, e.g. openai_fetch or llamacpp_fetch
+// API fetch function, e.g. fetch_openai or fetch_llamacpp
 
 char * (*fetch)(config_t *config, const char *prompt, int history_length);
 
@@ -132,16 +132,16 @@ setup(void)
 	REQUIRE(general, api);
 
 	if (strcmp(config.general_api, "openai") == 0) {
-		fetch = openai_fetch;
+		fetch = fetch_openai;
 		REQUIRE(openai, key);
 		REQUIRE(openai, endpoint);
 	} else if (strcmp(config.general_api, "anthropic") == 0) {
-		fetch = anthropic_fetch;
+		fetch = fetch_anthropic;
 		REQUIRE(anthropic, key);
 		REQUIRE(anthropic, endpoint);
 		REQUIRE(anthropic, version);
 	} else if (strcmp(config.general_api, "llamacpp") == 0) {
-		fetch = llamacpp_fetch;
+		fetch = fetch_llamacpp;
 		REQUIRE(llamacpp, endpoint);
 	} else {
 		fprintf(stderr, "Unsupported API: [%s].\n", config.general_api);

diff --git a/src/anthropic_fetch.c → src/fetch_anthropic.c b/src/anthropic_fetch.c → src/fetch_anthropic.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "support.h"
-#include "anthropic_fetch.h"
+#include "fetch_anthropic.h"
 
 // HTTP headers
 static char *key_header;
@@ -84,7 +84,7 @@ initialize(config_t *config)
  * Provide context in the form of n-shot prompts and history prompts.
  */
 char *
-anthropic_fetch(config_t *config, const char *prompt, int history_length)
+fetch_anthropic(config_t *config, const char *prompt, int history_length)
 {
 	CURLcode res;
 

diff --git a/src/anthropic_fetch.h → src/fetch_anthropic.h b/src/anthropic_fetch.h → src/fetch_anthropic.h
@@ -21,4 +21,4 @@
 #include "config.h"
 
 char *anthropic_get_response_content(const char *json_response);
-char *anthropic_fetch(config_t *config, const char *prompt, int history_length);
+char *fetch_anthropic(config_t *config, const char *prompt, int history_length);
diff --git a/src/anthropic_fetch_test.c → src/fetch_anthropic_test.c b/src/anthropic_fetch_test.c → src/fetch_anthropic_test.c
@@ -19,7 +19,7 @@
  */
 
 #include "CuTest.h"
-#include "anthropic_fetch.h"
+#include "fetch_anthropic.h"
 
 static const char json_response[] = "{"
     "  \"content\": ["

diff --git a/src/llamacpp_fetch.c → src/fetch_llamacpp.c b/src/llamacpp_fetch.c → src/fetch_llamacpp.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "support.h"
-#include "llamacpp_fetch.h"
+#include "fetch_llamacpp.h"
 
 // Return the response content from a llama.cpp JSON response
 STATIC char *
@@ -96,7 +96,7 @@ prompt_append(struct string *s, const char *role, const char *prompt)
  * Provide context in the form of n-shot prompts and history prompts.
  */
 char *
-llamacpp_fetch(config_t *config, const char *prompt, int history_length)
+fetch_llamacpp(config_t *config, const char *prompt, int history_length)
 {
 	CURLcode res;
 

diff --git a/src/llamacpp_fetch.h → src/fetch_llamacpp.h b/src/llamacpp_fetch.h → src/fetch_llamacpp.h
@@ -21,4 +21,4 @@
 #include "config.h"
 
 char *llamacpp_get_response_content(const char *json_response);
-char *llamacpp_fetch(config_t *config, const char *prompt, int history_length);
+char *fetch_llamacpp(config_t *config, const char *prompt, int history_length);
diff --git a/src/llamacpp_fetch_test.c → src/fetch_llamacpp_test.c b/src/llamacpp_fetch_test.c → src/fetch_llamacpp_test.c
@@ -19,7 +19,7 @@
  */
 
 #include "CuTest.h"
-#include "llamacpp_fetch.h"
+#include "fetch_llamacpp.h"
 
 static const char json_response[] = "{"
 	"  \"content\": \"Assistant: shutdown -h now\","

diff --git a/src/openai_fetch.c → src/fetch_openai.c b/src/openai_fetch.c → src/fetch_openai.c
@@ -82,7 +82,7 @@ initialize(config_t *config)
  * Provide context in the form of n-shot prompts and history prompts.
  */
 char *
-openai_fetch(config_t *config, const char *prompt, int history_length)
+fetch_openai(config_t *config, const char *prompt, int history_length)
 {
 	CURLcode res;
 

diff --git a/src/openai_fetch.h → src/fetch_openai.h b/src/openai_fetch.h → src/fetch_openai.h
@@ -21,4 +21,4 @@
 #include "config.h"
 
 char *openai_get_response_content(const char *json_response);
-char *openai_fetch(config_t *config, const char *prompt, int history_length);
+char *fetch_openai(config_t *config, const char *prompt, int history_length);
diff --git a/src/openai_fetch_test.c → src/fetch_openai_test.c b/src/openai_fetch_test.c → src/fetch_openai_test.c
@@ -19,7 +19,7 @@
  */
 
 #include "CuTest.h"
-#include "openai_fetch.h"
+#include "fetch_openai.h"
 
 static const char json_response[] = "{\n"
 	"  \"id\": \"chatcmpl-7lg1IuegIknbhVaP00yWmdOeCeWi1\",\n"