MetaList 0.1.7__tar.gz → 0.1.8__tar.gz

{MetaList-0.1.7 → MetaList-0.1.8/MetaList.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MetaList
-Version: 0.1.7
+Version: 0.1.8
 Summary: A PKM web app integrated with LLMs
 Home-page: https://github.com/evolvingstuff/MetaList
 Author: Thomas Lahore
@@ -14,6 +14,7 @@ License-File: LICENSE
 Requires-Dist: bottle==0.12.25
 Requires-Dist: bottle-sqlite==0.2.0
 Requires-Dist: beautifulsoup4~=4.12.2
+Requires-Dist: requests==2.31.0
 Requires-Dist: tqdm==4.66.1
 
 

{MetaList-0.1.7 → MetaList-0.1.8}/MetaList.egg-info/requires.txt

@@ -1,4 +1,5 @@
 bottle==0.12.25
 bottle-sqlite==0.2.0
 beautifulsoup4~=4.12.2
+requests==2.31.0
 tqdm==4.66.1

{MetaList-0.1.7/MetaList.egg-info → MetaList-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MetaList
-Version: 0.1.7
+Version: 0.1.8
 Summary: A PKM web app integrated with LLMs
 Home-page: https://github.com/evolvingstuff/MetaList
 Author: Thomas Lahore
@@ -14,6 +14,7 @@ License-File: LICENSE
 Requires-Dist: bottle==0.12.25
 Requires-Dist: bottle-sqlite==0.2.0
 Requires-Dist: beautifulsoup4~=4.12.2
+Requires-Dist: requests==2.31.0
 Requires-Dist: tqdm==4.66.1
 
 

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/app.py

@@ -3,7 +3,8 @@ from typing import List
 from bottle import Bottle, run, static_file, request, response
 import bottle_sqlite
 import requests
-from metalist.config import reset_undo_stack_on_search, port, open_ai_url, open_ai_model, development_mode
+
+from metalist import config
 from metalist.utils.chat_prompts import build_initial_prompts, build_selection_prompt
 from metalist.utils.crud import get_database_path
 from metalist.utils.search_suggestions import calculate_search_suggestions
@@ -27,10 +28,10 @@ app.install(plugin)
 
 
 def run_app():
-    if development_mode:
-        print('DEV MODE = True')
+    if config.development_mode:
+        print('config.development_mode = True')
     initialize_cache(cache)
-    run(app, port=port, debug=False)
+    run(app, port=config.port, debug=False)
 
 
 @app.route("/tests/<filepath:path>", method="GET")
@@ -352,7 +353,7 @@ def search(db):
     # TODO why recreate context?
     context = Context(context.app_state, search_text=context.search_text, search_filter=context.search_filter)
     filtered_items, reached_scroll_end = filter_and_sort_items(cache, context, updated_search=True, dirty_ranking=True)
-    if reset_undo_stack_on_search:
+    if config.reset_undo_stack_on_search:
         snapshots.reset()
     else:
         crud.rollback()
@@ -605,7 +606,7 @@ def chat_send_message(db):
 
     # Prepare the payload for the OpenAI API
     data = {
-        "model": open_ai_model,
+        "model": config.open_ai_model,
         "messages": chat_history
     }
     headers = {
@@ -614,7 +615,7 @@ def chat_send_message(db):
     }
 
     # Make a synchronous POST request to the OpenAI Chat API  # TODO FastAPI
-    openai_response = requests.post(open_ai_url, json=data, headers=headers)
+    openai_response = requests.post(config.open_ai_url, json=data, headers=headers)
 
     # Check if the request was successful and process the response
     if openai_response.status_code == 200:
@@ -631,6 +632,6 @@ def chat_send_message(db):
 
 
 if __name__ == '__main__':
-    global development_mode
-    development_mode = True
+    print('setting config.development_mode = True')
+    config.development_mode = True
     run_app()

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/crud.py

@@ -1,6 +1,6 @@
 import json
 import os
-from metalist.config import db_name, db_dir
+from metalist import config
 
 
 def clean_item(item):
@@ -13,7 +13,7 @@ def clean_item(item):
 
 def get_database_path():
     home_dir = os.path.expanduser("~")
-    database_path = os.path.join(home_dir, db_dir, db_name)
+    database_path = os.path.join(home_dir, config.db_dir, config.db_name)
     os.makedirs(os.path.dirname(database_path), exist_ok=True)
     return database_path
 

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/decorate_single_item.py

@@ -1,7 +1,7 @@
 import re
 import json
 import hashlib
-from metalist.config import inherit_text
+from metalist import config
 from metalist.utils.search_filters import filter_subitem_negative, filter_subitem_positive
 from metalist.utils.generate import generate_timestamp
 
@@ -79,7 +79,7 @@ def decorate_item(item, cache, dirty_edit=True, dirty_text=True, dirty_tags=True
                         if tag not in subitem['_tags']:
                             subitem['_tags'].append(tag)
                 if dirty_text:
-                    if inherit_text:
+                    if config.inherit_text:
                         subitem['_searchable_text_full'] += ' ' + parent['_searchable_text']
 
         parent_stack.append(subitem)

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/initialize.py

@@ -4,7 +4,7 @@ import os
 import sqlite3
 import time
 import tqdm
-from metalist.config import development_mode
+from metalist import config
 from metalist.utils.crud import get_database_path
 from metalist.utils.decorate_single_item import decorate_item
 from metalist.utils.ontology import *
@@ -31,7 +31,7 @@ def initialize_cache(cache):
         db = sqlite3.connect(db_path)
         sql = 'CREATE TABLE IF NOT EXISTS items (id INTEGER PRIMARY KEY, value TEXT NOT NULL);'
         db.execute(sql)
-        if development_mode:
+        if config.development_mode:
             print('created new items table for empty database')
     else:
         db = sqlite3.connect(db_path)
@@ -49,6 +49,6 @@ def initialize_cache(cache):
             cache['hash_to_item'][item['_hash']] = copy.deepcopy(item)
             cache['search_index'].add_item(item)
         t2 = time.time()
-        if development_mode:
+        if config.development_mode:
             print(f'warmed up {len(rows)} items in {((t2-t1)*1000):.2f} ms')
             cache['search_index'].show()

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/ontology.py

@@ -1,4 +1,4 @@
-from metalist.config import development_mode
+from metalist import config
 
 
 def extract_ontology(cache, item):
@@ -18,7 +18,7 @@ def extract_ontology(cache, item):
                 parts = line.split(' ')
                 if '=' in parts:
                     if '=>' in parts:
-                        if development_mode:
+                        if config.development_mode:
                             print(f'weird rule (skipping): {parts}')
                         continue
                     indx = parts.index('=')
@@ -35,7 +35,7 @@ def extract_ontology(cache, item):
                             cache['ontology'][left].add(right)
                 elif '=>' in parts:
                     if '=' in parts:
-                        if development_mode:
+                        if config.development_mode:
                             print(f'weird rule (skipping): {parts}')
                         continue
                     indx = parts.index('=>')
@@ -68,7 +68,7 @@ def propagate_implications(cache):
             if new_implications:
                 implications[tag].update(new_implications)
                 new_implications_added = True
-    if development_mode:
+    if config.development_mode:
         print(f'ontology calculated in {total_passes} passes')
     cache['implications'] = implications
 

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/search_filters.py

@@ -1,8 +1,4 @@
-from metalist.config import \
-    use_partial_tag_matches_negative, \
-    use_partial_text_matches_negative, \
-    use_partial_tag_matches_positive, \
-    use_partial_text_matches_positive
+from metalist import config
 
 
 def filter_subitem_negative(subitem, search_filter: str) -> bool:
@@ -15,7 +11,7 @@ def filter_subitem_negative(subitem, search_filter: str) -> bool:
     if search_filter['negated_partial_tag'] is not None:
         # TODO: apply use_partial_tag_matches logic
         for subitem_tag in subitem_tags:
-            if use_partial_tag_matches_negative:
+            if config.use_partial_tag_matches_negative:
                 if subitem_tag.lower().startswith(search_filter['negated_partial_tag'].lower()):
                     return True
             else:
@@ -24,7 +20,7 @@ def filter_subitem_negative(subitem, search_filter: str) -> bool:
     for negated_text in search_filter['negated_texts']:
         if negated_text.lower() in subitem_text:
             return True
-    if use_partial_text_matches_negative and \
+    if config.use_partial_text_matches_negative and \
             search_filter['negated_partial_text'] is not None and \
             search_filter['negated_partial_text'].lower() in subitem_text:
         return True
@@ -41,7 +37,7 @@ def filter_subitem_positive(subitem, search_filter: str) -> bool:
     if search_filter['partial_tag'] is not None:
         one_match = False
         for subitem_tag in subitem_tags:
-            if use_partial_tag_matches_positive:
+            if config.use_partial_tag_matches_positive:
                 if subitem_tag.lower().startswith(search_filter['partial_tag'].lower()):
                     one_match = True
                     break
@@ -54,7 +50,7 @@ def filter_subitem_positive(subitem, search_filter: str) -> bool:
     for required_text in search_filter['texts']:
         if required_text.lower() not in subitem_text:
             return False
-    if use_partial_text_matches_positive and \
+    if config.use_partial_text_matches_positive and \
             search_filter['partial_text'] is not None and \
             search_filter['partial_text'].lower() not in subitem_text:
         return False

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/search_index.py

@@ -38,23 +38,23 @@ class SearchIndex:
             full_match_item_ids = set(self.item_id_to_tags.keys())
             for tag in search_filter['tags']:
                 full_match_item_ids.intersection_update(self.tag_to_item_ids[tag])
-            print(f'{len(full_match_item_ids)} full match item ids')
+            # print(f'{len(full_match_item_ids)} full match item ids')
 
         continuation_item_ids = None
         if search_filter['partial_tag'] is not None:
             continuations = self.possible_tag_continuations(search_filter['partial_tag'])
-            print(continuations)
+            # print(continuations)
             continuation_item_ids = set()
             for tag in continuations:
                 continuation_item_ids.update(self.tag_to_item_ids[tag])
-            print(f'{len(continuation_item_ids)} continuation item ids')
+            # print(f'{len(continuation_item_ids)} continuation item ids')
 
         candidate_item_ids = set(self.item_id_to_tags.keys())
         if continuation_item_ids is not None:
             candidate_item_ids.intersection_update(continuation_item_ids)
         if full_match_item_ids is not None:
             candidate_item_ids.intersection_update(full_match_item_ids)
-        print(f'{len(candidate_item_ids)} candidate item ids')
+        # print(f'{len(candidate_item_ids)} candidate item ids')
 
         return candidate_item_ids
 

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/search_suggestions.py

@@ -1,21 +1,20 @@
 import time
-
-from metalist.config import max_search_suggestions, development_mode
+from metalist import config
 
 
 def calculate_search_suggestions(cache, context):
     t1 = time.time()
     current_search = context.search_text
-    if development_mode:
+    if config.development_mode:
         print(f'current_search: `{current_search}`')
 
     if context.search_filter['partial_text'] is not None or context.search_filter['negated_partial_text'] is not None:
-        if development_mode:
+        if config.development_mode:
             print('text completion mode... no suggestions')
         return []
 
     if context.search_filter['negated_partial_tag'] is not None:
-        if development_mode:
+        if config.development_mode:
             print('negated partial tag... no suggestions... for now (TODO)')
         return []
 
@@ -102,9 +101,9 @@ def calculate_search_suggestions(cache, context):
         already_suggested.add(tag)
         full_suggestion = prefix + tag + ' '
         full_suggestions.append(full_suggestion)
-        if len(full_suggestions) >= max_search_suggestions:
+        if len(full_suggestions) >= config.max_search_suggestions:
             break
     t2 = time.time()
-    if development_mode:
+    if config.development_mode:
         print(f'search suggestions took {(t2-t1)*1000:.4f} ms to calculate')
     return full_suggestions

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/server.py

@@ -2,8 +2,7 @@ import copy
 import time
 from dataclasses import dataclass
 from typing import List
-
-from metalist.config import development_mode, simulated_lag_seconds
+from metalist import config
 from metalist.utils.decorate_single_item import calculate_matches_per_item, hash_dictionary
 
 
@@ -76,7 +75,7 @@ def error_response(message):
 
 
 def noop_response(message):
-    if development_mode:
+    if config.development_mode:
         print(f'NOOP: {message}')
     return {
         'noop': message
@@ -93,7 +92,7 @@ def recalculate_item_ranks(cache, dirty_rank):
     global prev_sorting_order
 
     if len(cache['id_to_item']) == 0:
-        if development_mode:
+        if config.development_mode:
             print('no items to rank')
         return []
 
@@ -101,14 +100,14 @@ def recalculate_item_ranks(cache, dirty_rank):
     t1 = time.time()
 
     if not dirty_rank and prev_sorting_order is not None:
-        if development_mode:
+        if config.development_mode:
             print('using previous sorting order')
         # TODO this could be more efficient
         for id in prev_sorting_order:
             node = cache['id_to_item'][id]
             sorted_items.append(node)
     else:
-        if development_mode:
+        if config.development_mode:
             print('dirty_rank == True')
         head = None
         for item in cache['id_to_item'].values():
@@ -128,7 +127,7 @@ def recalculate_item_ranks(cache, dirty_rank):
         assert len(sorted_items) == len(cache['id_to_item']), f'mismatch when calculating item ranks, location 2: {len(sorted_items)} vs {len(cache["id_to_item"])}'
         assert len(prev_sorting_order) == len(sorted_items), f'mismatch with prev_sorting_order'
     t2 = time.time()
-    if development_mode:
+    if config.development_mode:
         print(f're/calculating item ranks took {((t2-t1)*1000):.2f} ms')
     return sorted_items
 
@@ -136,9 +135,9 @@ def recalculate_item_ranks(cache, dirty_rank):
 def filter_and_sort_items(cache, context, updated_search=False, dirty_ranking=False):
 
     t1 = time.time()
-    if development_mode and simulated_lag_seconds is not None and simulated_lag_seconds > 0:
-        print(f'simulating lag of {simulated_lag_seconds} seconds')
-        time.sleep(simulated_lag_seconds)
+    if config.development_mode and config.simulated_lag_seconds is not None and config.simulated_lag_seconds > 0:
+        print(f'simulating lag of {config.simulated_lag_seconds} seconds')
+        time.sleep(config.simulated_lag_seconds)
     filtered_items = []
     total_precomputed = 0
     total_processed = 0
@@ -147,7 +146,7 @@ def filter_and_sort_items(cache, context, updated_search=False, dirty_ranking=Fa
     all_sorted_items = recalculate_item_ranks(cache, dirty_ranking)
 
     if updated_search:
-        if development_mode:
+        if config.development_mode:
             print('updated search, therefore all item matches are dirty')
         for item in all_sorted_items:
             item['_dirty_matches'] = True

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/snapshots.py

@@ -1,5 +1,5 @@
 from typing import List
-from metalist.config import development_mode
+from metalist import config
 from metalist.utils.reporting import analyze_cache
 
 
@@ -25,7 +25,7 @@ class Snapshots:
         self.stack_pointer: int = -1
 
     def test(self):
-        if not development_mode:
+        if not config.development_mode:
             return
         try:
             for i in range(len(self.stack)-1):
@@ -42,7 +42,7 @@ class Snapshots:
         else:
             result = self.stack[self.stack_pointer]
             self.stack_pointer -= 1
-        if development_mode:
+        if config.development_mode:
             self.show()
         return result
 
@@ -52,23 +52,23 @@ class Snapshots:
             self.stack_pointer += 1
             result = self.stack[self.stack_pointer]
         else:
-            if development_mode:
+            if config.development_mode:
                 print('end of stack')
-        if development_mode:
+        if config.development_mode:
             self.show()
         return result
 
     def reset(self):
         self.stack = []
         self.stack_pointer = -1
-        if development_mode:
+        if config.development_mode:
             self.show()
 
     def push(self, snapshot: Snapshot):
         self.stack = self.stack[:self.stack_pointer+1]
         self.stack.append(snapshot)
         self.stack_pointer += 1
-        if development_mode:
+        if config.development_mode:
             self.show()
 
     def show(self):
@@ -110,7 +110,7 @@ def double_merge(op1, op2, cache, snapshots):
     if a.item_subitem_id != b.item_subitem_id:
         return False
     if a.op_name == op1 and b.op_name == op2:
-        if development_mode:
+        if config.development_mode:
             snapshots.show()
         merged_snapshot = Snapshot(op1, a.pre, b.post, b.item_subitem_id)
         # point at new desired location
@@ -208,7 +208,7 @@ quad_patterns = [
 
 
 def compress_snapshots(cache: dict, snapshots: Snapshots):
-    if development_mode:
+    if config.development_mode:
         print('compress_snapshots()')
         analyze_cache(cache)
         snapshots.test()
@@ -227,12 +227,12 @@ def compress_snapshots(cache: dict, snapshots: Snapshots):
                 matches += 1
                 continue
         if matches == 0:
-            if development_mode:
+            if config.development_mode:
                 print('no compression matches found')
         else:
-            if development_mode:
+            if config.development_mode:
                 snapshots.show()
-        if development_mode:
+        if config.development_mode:
             snapshots.test()
             analyze_cache(cache)
         return

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/tags_suggestions.py

@@ -1,5 +1,5 @@
 import time
-from metalist.config import max_tags_suggestions, development_mode
+from metalist import config
 
 
 def jaccard_index(tags1, tags2):
@@ -148,7 +148,7 @@ def calculate_tags_suggestions(cache, context):
         prefix = ' '.join(selected_subitem['tags'].split()[:-1]) + ' '
     else:
         prefix = ' '.join(selected_subitem['tags'].split()) + ' '
-    if development_mode:
+    if config.development_mode:
         print(f'{len(sorted_specific_tags)} specific suggestions | {len(sorted_generic_tags)} less-specific suggestions')
     already_suggested = set(selected_subitem['_tags'])
     for tag in combined_sorted_tags:
@@ -161,9 +161,9 @@ def calculate_tags_suggestions(cache, context):
         already_suggested.add(tag)
         full_suggestion = prefix + tag + ' '
         full_suggestions.append(full_suggestion)
-        if len(full_suggestions) >= max_tags_suggestions:
+        if len(full_suggestions) >= config.max_tags_suggestions:
             break
     t2 = time.time()
-    if development_mode:
+    if config.development_mode:
         print(f'calculate tags suggestions took {(t2 - t1)*1000:.4f} ms')
     return full_suggestions

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/update_multiple_items.py

@@ -1,7 +1,7 @@
 import copy
 import time
 import tqdm
-from metalist.config import always_add_to_global_top, development_mode
+from metalist import config
 from metalist.utils.decorate_single_item import decorate_item
 from metalist.utils.find import find_prev_visible_item, find_next_visible_item
 from metalist.utils.generate import generate_unplaced_new_item
@@ -149,7 +149,7 @@ def add_item_sibling(db, cache, context):
 def add_item_top(db, cache, context):
     new_item = generate_unplaced_new_item(cache, context.search_filter)
     crud.create(db, new_item)
-    if always_add_to_global_top:
+    if config.always_add_to_global_top:
         if len(cache['id_to_item'].keys()) == 0:
             new_item['prev'] = None
             new_item['next'] = None
@@ -249,7 +249,7 @@ def paste_sibling(db, cache, context):
 
 
 def recalculate_ontology(db, cache: dict, context):
-    if development_mode:
+    if config.development_mode:
         print('----------------------------------')
         print('RECALCUATING ONTOLOGY')
         print('----------------------------------')
@@ -261,7 +261,7 @@ def recalculate_ontology(db, cache: dict, context):
         extract_ontology(cache, item)
     propagate_implications(cache)
     t2 = time.time()
-    if development_mode:
+    if config.development_mode:
         print(f'recalculating ontology took {(t2 - t1):.6f} seconds')
     t1 = time.time()
     # TODO: this could be made more efficient by only updating affected items
@@ -276,5 +276,5 @@ def recalculate_ontology(db, cache: dict, context):
             cache['hash_to_item'][item['_hash']] = copy.deepcopy(item)
             tot_updated += 1
     t2 = time.time()
-    if development_mode:
+    if config.development_mode:
         print(f'decorating items took {(t2-t1):.6f} seconds. {tot_updated} updated items')

{MetaList-0.1.7 → MetaList-0.1.8}/metalist/utils/update_single_item.py

@@ -1,5 +1,5 @@
 import copy
-from metalist.config import outdent_all_siblings_below
+from metalist import config
 from metalist.utils import crud
 from metalist.utils.decorate_single_item import decorate_item
 from metalist.utils.find import find_sibling_index_above, find_subtree_bounds, find_sibling_index_below, \
@@ -133,7 +133,7 @@ def outdent(db, context, cache):
     subitem = context.item['subitems'][context.subitem_index]
     indent = subitem['indent']
     assert indent >= 2, 'cannot outdent any further'
-    if outdent_all_siblings_below:
+    if config.outdent_all_siblings_below:
         upper_bound, lower_bound = find_subtree_bounds_all_siblings_below(context.item, context.subitem_index)
     else:
         upper_bound, lower_bound = find_subtree_bounds(context.item, context.subitem_index)

{MetaList-0.1.7 → MetaList-0.1.8}/setup.py

@@ -12,7 +12,7 @@ with open('README.md', 'r', encoding='utf-8') as fh:
 
 setup(
     name='MetaList',
-    version='0.1.7',
+    version='0.1.8',
     author='Thomas Lahore',
     author_email='tom.lahore@gmail.com',
     description='A PKM web app integrated with LLMs',