diff --git a/com.jeffser.Alpaca.json b/com.jeffser.Alpaca.json index 337e76a..8848772 100644 --- a/com.jeffser.Alpaca.json +++ b/com.jeffser.Alpaca.json @@ -71,6 +71,31 @@ } ] }, + { + "name": "ollama", + "buildsystem": "simple", + "build-commands": [ + "install -Dm0755 ollama* ${FLATPAK_DEST}/bin/ollama" + ], + "sources": [ + { + "type": "file", + "url": "https://github.com/ollama/ollama/releases/download/v0.1.38/ollama-linux-amd64", + "sha256": "c3360812503a9756a507ebb9d78667e2b21800a760b45046bc48a8f3b81972f4", + "only-arches": [ + "x86_64" + ] + }, + { + "type": "file", + "url": "https://github.com/ollama/ollama/releases/download/v0.1.38/ollama-linux-arm64", + "sha256": "f2d091afe665b2d5ba8b68e2473d36cdfaf80c61c7d2844a0a8f533c4e62f547", + "only-arches": [ + "aarch64" + ] + } + ] + }, { "name" : "alpaca", "builddir" : true, diff --git a/data/com.jeffser.Alpaca.metainfo.xml.in b/data/com.jeffser.Alpaca.metainfo.xml.in index b609d41..33c6fd7 100644 --- a/data/com.jeffser.Alpaca.metainfo.xml.in +++ b/data/com.jeffser.Alpaca.metainfo.xml.in @@ -63,6 +63,15 @@ https://github.com/Jeffser/Alpaca https://github.com/sponsors/Jeffser + + https://github.com/Jeffser/Alpaca/releases/tag/0.9.2 + +

Fix

+
    +
  • Fixed: app didn't open if models tweaks wasn't present in the config files
  • +
+
+
https://github.com/Jeffser/Alpaca/releases/tag/0.9.1 diff --git a/data/meson.build b/data/meson.build index 2dba3a7..a63054f 100644 --- a/data/meson.build +++ b/data/meson.build @@ -33,24 +33,24 @@ test('Validate schema file', compile_schemas, args: ['--strict', '--dry-run', meson.current_source_dir()]) -service_conf = configuration_data() -service_conf.set('appid', application_id) -service_conf.set('libexecdir', join_paths(get_option('prefix'), get_option('bindir'))) -configure_file( - input: 'com.jeffser.Alpaca.SearchProvider.service.in', - output: '@0@.SearchProvider.service'.format(application_id), - configuration: service_conf, - install_dir: join_paths(join_paths(get_option('prefix'), get_option('datadir')), 'dbus-1', 'services') -) +#service_conf = configuration_data() +#service_conf.set('appid', application_id) +#service_conf.set('libexecdir', join_paths(get_option('prefix'), get_option('bindir'))) +#configure_file( + #input: 'com.jeffser.Alpaca.SearchProvider.service.in', + #output: '@0@.SearchProvider.service'.format(application_id), + #configuration: service_conf, + #install_dir: join_paths(join_paths(get_option('prefix'), get_option('datadir')), 'dbus-1', 'services') +#) -search_provider_conf = configuration_data() -search_provider_conf.set('appid', application_id) -configure_file( - configuration: search_provider_conf, - input: files('com.jeffser.Alpaca.SearchProvider.ini.in'), - install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers'), - output: '@0@.SearchProvider.ini'.format(application_id) -) +#search_provider_conf = configuration_data() +#search_provider_conf.set('appid', application_id) +#configure_file( + #configuration: search_provider_conf, + #input: files('com.jeffser.Alpaca.SearchProvider.ini.in'), + #install_dir: join_paths(get_option('datadir'), 'gnome-shell', 'search-providers'), + #output: '@0@.SearchProvider.ini'.format(application_id) +#) subdir('icons') \ No newline at end of file diff --git a/meson.build b/meson.build index 54e2dca..53afcdc 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('Alpaca', 'c', - version: '0.9.1', + version: '0.9.2', meson_version: '>= 0.62.0', default_options: [ 'warning_level=2', 'werror=false', ], ) diff --git a/src/alpaca_search_provider.in b/src/alpaca_search_provider.in index 91cda15..3b1f108 100644 --- a/src/alpaca_search_provider.in +++ b/src/alpaca_search_provider.in @@ -11,7 +11,19 @@ class SearchProvider: def __init__(self): print("ALPACA __init__") self.connection = Gio.bus_get_sync(Gio.BusType.SESSION, None) - self.connection.register_object(DBUS_OBJECT_PATH, self.get_interface_info(), None, self.handle_method_call, None) + if not self.connection: + print("ALPACA Failed to get D-Bus connection") + return + + print("ALPACA D-Bus connection obtained") + + interface_info = self.get_interface_info() + self.registration_id = self.connection.register_object(DBUS_OBJECT_PATH, interface_info, self.handle_method_call, None) + + if self.registration_id > 0: + print(f"ALPACA Object registered with ID: {self.registration_id}") + else: + print("ALPACA Failed to register object") def get_interface_info(self): print("ALPACA get_interface_info") @@ -56,9 +68,9 @@ class SearchProvider: print("ALPACA handle_get_initial_result_set") terms = parameters.unpack()[0] print(f"Initial search terms: {terms}") - results = [] + results = ["result1", "result2"] if "Alpaca" in terms: - results.append("placeholder_result") + results.append("alpaca_placeholder_result") print(f"Returning results: {results}") invocation.return_value(GLib.Variant("(as)", [results])) @@ -66,9 +78,9 @@ class SearchProvider: print("ALPACA handle_get_subsearch_result_set") previous_results, terms = parameters.unpack() print(f"Subsearch terms: {terms}, previous results: {previous_results}") - results = [] + results = ["result3", "result4"] if "Alpaca" in terms: - results.append("sub_placeholder_result") + results.append("sub_alpaca_placeholder_result") print(f"Returning subsearch results: {results}") invocation.return_value(GLib.Variant("(as)", [results])) @@ -91,6 +103,9 @@ class SearchProvider: if __name__ == "__main__": provider = SearchProvider() - loop = GLib.MainLoop() - loop.run() - + if provider.registration_id > 0: + loop = GLib.MainLoop() + print("ALPACA Running main loop") + loop.run() + else: + print("ALPACA Failed to start main loop due to object registration failure") diff --git a/src/main.py b/src/main.py index 663bab5..08709dc 100644 --- a/src/main.py +++ b/src/main.py @@ -47,7 +47,7 @@ class AlpacaApplication(Adw.Application): application_name='Alpaca', application_icon='com.jeffser.Alpaca', developer_name='Jeffry Samuel Eduarte Rojas', - version='0.9.1', + version='0.9.2', developers=['Jeffser https://jeffser.com'], designers=['Jeffser https://jeffser.com'], translator_credits='Alex K (Russian) https://github.com/alexkdeveloper\nJeffser (Spanish) https://jeffser.com\nDaimar Stein (Brazilian Portuguese) https://github.com/not-a-dev-stein\nLouis Chauvet-Villaret (French) https://github.com/loulou64490',