klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-06 13:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:khoj-ai/khoj into features/internet-enabled-search

Browse Source
This commit is contained in:
sabaimran
2023-11-19 16:20:08 -08:00
parent ef5e9d66c1 237195e20e
commit b8e6883a81
14 changed files with 276 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/database/migrations/0019_alter_googleuser_family_name_and_more.py Normal file
View File

@@ -0,0 +1,27 @@
# Generated by Django 4.2.7 on 2023-11-19 22:20
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("database", "0018_searchmodelconfig_delete_searchmodel"),
]
operations = [
migrations.AlterField(
model_name="googleuser",
name="family_name",
field=models.CharField(blank=True, default=None, max_length=200, null=True),
),
migrations.AlterField(
model_name="googleuser",
name="given_name",
field=models.CharField(blank=True, default=None, max_length=200, null=True),
),
migrations.AlterField(
model_name="googleuser",
name="name",
field=models.CharField(blank=True, default=None, max_length=200, null=True),
),
]

6
src/database/models/__init__.py
View File

@@ -27,9 +27,9 @@ class GoogleUser(models.Model):
sub = models.CharField(max_length=200)
azp = models.CharField(max_length=200)
email = models.CharField(max_length=200)
name = models.CharField(max_length=200)
given_name = models.CharField(max_length=200)
family_name = models.CharField(max_length=200)
name = models.CharField(max_length=200, null=True, default=None, blank=True)
given_name = models.CharField(max_length=200, null=True, default=None, blank=True)
family_name = models.CharField(max_length=200, null=True, default=None, blank=True)
picture = models.CharField(max_length=200, null=True, default=None)
locale = models.CharField(max_length=200)

11
src/khoj/processor/data_sources/org_mode/org_to_entries.py
View File

@@ -100,16 +100,17 @@ class OrgToEntries(TextToEntries):
continue
todo_str = f"{parsed_entry.todo} " if parsed_entry.todo else ""
# Prepend filename as top heading to entry
filename = Path(entry_to_file_map[parsed_entry]).stem
# Prepend ancestor headings, filename as top heading to entry for context
ancestors_trail = " / ".join(parsed_entry.ancestors) or Path(entry_to_file_map[parsed_entry])
if parsed_entry.heading:
heading = f"* {filename}\n** {todo_str}{parsed_entry.heading}."
heading = f"* Path: {ancestors_trail}\n** {todo_str}{parsed_entry.heading}."
else:
heading = f"* {filename}."
heading = f"* Path: {ancestors_trail}."
compiled = heading
if state.verbose > 2:
logger.debug(f"Title: {parsed_entry.heading}")
logger.debug(f"Title: {heading}")
if parsed_entry.tags:
tags_str = " ".join(parsed_entry.tags)

38
src/khoj/processor/data_sources/org_mode/orgnode.py
View File

@@ -80,6 +80,7 @@ def makelist(file, filename):
} # populated from #+SEQ_TODO line
level = ""
heading = ""
ancestor_headings = []
bodytext = ""
introtext = ""
tags = list() # set of all tags in headline
@@ -98,7 +99,7 @@ def makelist(file, filename):
heading_search = re.search(r"^(\*+)\s(.*?)\s*$", line)
if heading_search: # we are processing a heading line
if heading: # if we have are on second heading, append first heading to headings list
thisNode = Orgnode(level, heading, bodytext, tags)
thisNode = Orgnode(level, heading, bodytext, tags, ancestor_headings)
if closed_date:
thisNode.closed = closed_date
closed_date = ""
@@ -114,6 +115,8 @@ def makelist(file, filename):
thisNode.properties = property_map
nodelist.append(thisNode)
property_map = {"LINE": f"file:{normalize_filename(filename)}::{ctr}"}
previous_level = level
previous_heading = heading
level = heading_search.group(1)
heading = heading_search.group(2)
bodytext = ""
@@ -126,6 +129,17 @@ def makelist(file, filename):
for parsedtag in parsedtags.split(":"):
if parsedtag != "":
tags.append(parsedtag)
# Add previous heading to ancestors if current heading is deeper than previous level
if len(level) > len(previous_level) and previous_heading:
ancestor_headings.append(previous_heading)
# Remove last ancestor(s) if current heading is shallower than previous level
elif len(level) < len(previous_level):
for _ in range(len(level), len(previous_level)):
if not ancestor_headings or len(ancestor_headings) == 0:
break
ancestor_headings.pop()
else: # we are processing a non-heading line
if line[:10] == "#+SEQ_TODO":
kwlist = re.findall(r"([A-Z]+)\(", line)
@@ -216,7 +230,7 @@ def makelist(file, filename):
nodelist = [thisNode] + nodelist
# write out last heading node
if heading:
thisNode = Orgnode(level, heading, bodytext, tags)
thisNode = Orgnode(level, heading, bodytext, tags, ancestor_headings)
thisNode.properties = property_map
if sched_date:
thisNode.scheduled = sched_date
@@ -243,6 +257,9 @@ def makelist(file, filename):
n.priority = priority_search.group(1)
n.heading = priority_search.group(2)
# Prefix filepath/title to ancestors
n.ancestors = [file_title] + n.ancestors
# Set SOURCE property to a file+heading based org-mode link to the entry
if n.level == 0:
n.properties["LINE"] = f"file:{normalize_filename(filename)}::0"
@@ -261,7 +278,7 @@ class Orgnode(object):
with the headline.
"""
def __init__(self, level, headline, body, tags):
def __init__(self, level, headline, body, tags, ancestor_headings=[]):
"""
Create an Orgnode object given the parameters of level (as the
raw asterisks), headline text (including the TODO tag), and
@@ -279,8 +296,21 @@ class Orgnode(object):
self._closed = "" # Closed date
self._properties = dict()
self._logbook = list() # List of clock-in, clock-out tuples representing logbook entries
self._ancestor_headings = ancestor_headings.copy()
# Look for priority in headline and transfer to prty field
@property
def ancestors(self) -> List[str]:
"""
Return the ancestor headings of the node
"""
return self._ancestor_headings
@ancestors.setter
def ancestors(self, new_ancestors):
"""
Update the ancestor headings of the node
"""
self._ancestor_headings = new_ancestors
@property
def heading(self):