Browse Source

feat(hadis): export narrator chain layers, order/gap flags, and identity fields in offline SQLite and transmitters API

- Add layer_count and multilingual layer_names (id, number, slug, name, description) to narrators_json in hadiths SQLite table
- Include order, chain_index, is_gap, layer/layer_slug/layer_level/layer_name, and full identity fields (arabic_full_name, known_as, arabic_known_as, nickname, arabic_nickname, kunya, arabic_kunya) on transmitter nodes and narrators table
- Return all chains' transmitters when ?layer query param is omitted on GET /api/hadis/<slug>/transmitters/ and always return complete layer_names list
master
Mohsen Taba 2 weeks ago
parent
commit
1a57d38cfd
  1. 235
      apps/hadis/management/commands/export_hadis_sqlite.py
  2. 17
      apps/hadis/serializers/hadis.py
  3. 14
      apps/hadis/views/hadis.py

235
apps/hadis/management/commands/export_hadis_sqlite.py

@ -24,6 +24,7 @@ from apps.hadis.serializers.hadis import (
DetailedInterpretationReferenceSerializer, DetailedInterpretationReferenceSerializer,
get_cached_edition_metadata, get_cached_edition_metadata,
) )
from apps.hadis.serializers.category import get_arabic_localized_text
from apps.hadis.utils.links import format_links_output from apps.hadis.utils.links import format_links_output
@ -198,6 +199,13 @@ class Command(BaseCommand):
slug TEXT UNIQUE, slug TEXT UNIQUE,
name TEXT, name TEXT,
title TEXT, title TEXT,
arabic_full_name TEXT,
known_as TEXT,
arabic_known_as TEXT,
nickname TEXT,
arabic_nickname TEXT,
kunya TEXT,
arabic_kunya TEXT,
gender TEXT, gender TEXT,
birth_year_hijri TEXT, birth_year_hijri TEXT,
death_year_hijri TEXT, death_year_hijri TEXT,
@ -452,34 +460,106 @@ class Command(BaseCommand):
) )
return len(rows) return len(rows)
def _build_kunya_values(self, t):
if not t:
return [], ''
kunya_items = list(t.kunyas.all()) if hasattr(t, 'kunyas') else []
if kunya_items:
by_lang = {}
for item in kunya_items:
raw_title = getattr(item, 'title', None)
if isinstance(raw_title, list):
for entry in raw_title:
if isinstance(entry, dict):
lc = entry.get('language_code') or 'en'
txt = (entry.get('text') or entry.get('title') or '').strip()
if txt:
by_lang.setdefault(lc, []).append(txt)
if by_lang:
multilingual = [
{
'language_code': lc,
'text': ('، ' if lc in ('ar', 'fa', 'ur') else ', ').join(vals),
}
for lc, vals in by_lang.items()
]
ar_kunya = ('، '.join(by_lang.get('ar', []))) or get_arabic_localized_text(multilingual) or ''
return multilingual, ar_kunya
raw_kunya = getattr(t, 'kunya', None)
ar_kunya = get_arabic_localized_text(raw_kunya) if raw_kunya else ''
return (raw_kunya or []), (ar_kunya or '')
def _serialize_narrator_person(self, t):
if not t:
return None
rel = getattr(t, 'reliability', None)
rel_dict = {
'id': rel.id,
'title': rel.title,
'slug': rel.slug,
'color': rel.color,
'main_color_code': rel.main_color_code,
'description': getattr(rel, 'description', None),
} if rel else None
kunya_val, arabic_kunya_val = self._build_kunya_values(t)
arabic_full_name = get_arabic_localized_text(t.full_name) if t.full_name else ''
arabic_known_as = get_arabic_localized_text(t.known_as) if getattr(t, 'known_as', None) else ''
arabic_nickname = get_arabic_localized_text(t.nickname) if getattr(t, 'nickname', None) else ''
return {
'id': t.id,
'slug': t.slug,
'name': t.full_name,
'title': t.full_name,
'full_name': t.full_name,
'arabic_full_name': arabic_full_name or '',
'known_as': getattr(t, 'known_as', None) or [],
'arabic_known_as': arabic_known_as or '',
'nickname': getattr(t, 'nickname', None) or [],
'arabic_nickname': arabic_nickname or '',
'kunya': kunya_val,
'arabic_kunya': arabic_kunya_val or '',
'gender': t.gender or '',
'birth_year_hijri': t.birth_year_hijri or '',
'death_year_hijri': t.death_year_hijri or '',
'birth_year_raw': t.birth_year_hijri or '',
'death_year_raw': t.death_year_hijri or '',
'reliability': rel_dict,
}
def _export_narrators(self, cursor): def _export_narrators(self, cursor):
narrators = Transmitters.objects.select_related('reliability').all()
narrators = Transmitters.objects.select_related('reliability').prefetch_related('kunyas').all()
rows = [] rows = []
for t in narrators: for t in narrators:
rel = t.reliability
rel_dict = {
'id': rel.id,
'title': rel.title,
'slug': rel.slug,
'color': rel.color,
'main_color_code': rel.main_color_code,
'description': getattr(rel, 'description', None),
} if rel else None
name_str = json.dumps(t.full_name, ensure_ascii=False) if isinstance(t.full_name, (dict, list)) else (t.full_name or '')
p = self._serialize_narrator_person(t)
name_str = json.dumps(p['full_name'], ensure_ascii=False) if isinstance(p['full_name'], (dict, list)) else (p['full_name'] or '')
known_as_str = json.dumps(p['known_as'], ensure_ascii=False) if isinstance(p['known_as'], (dict, list)) else (p['known_as'] or '')
nickname_str = json.dumps(p['nickname'], ensure_ascii=False) if isinstance(p['nickname'], (dict, list)) else (p['nickname'] or '')
kunya_str = json.dumps(p['kunya'], ensure_ascii=False) if isinstance(p['kunya'], (dict, list)) else (p['kunya'] or '')
rows.append(( rows.append((
t.id, t.id,
t.slug, t.slug,
name_str, name_str,
name_str, name_str,
t.gender or '',
t.birth_year_hijri or '',
t.death_year_hijri or '',
json.dumps(rel_dict, ensure_ascii=False),
p['arabic_full_name'],
known_as_str,
p['arabic_known_as'],
nickname_str,
p['arabic_nickname'],
kunya_str,
p['arabic_kunya'],
p['gender'],
p['birth_year_hijri'],
p['death_year_hijri'],
json.dumps(p['reliability'], ensure_ascii=False),
)) ))
cursor.executemany( cursor.executemany(
"""INSERT INTO narrators """INSERT INTO narrators
(id, slug, name, title, gender, birth_year_hijri, death_year_hijri, reliability_json)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)""",
(id, slug, name, title, arabic_full_name, known_as, arabic_known_as,
nickname, arabic_nickname, kunya, arabic_kunya,
gender, birth_year_hijri, death_year_hijri, reliability_json)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
rows rows
) )
return len(rows) return len(rows)
@ -814,12 +894,16 @@ class Command(BaseCommand):
.prefetch_related( .prefetch_related(
'categories__sect', 'categories__sect',
'tags', 'tags',
'narrator_layers',
'references__book_reference__author', 'references__book_reference__author',
'references__edition', 'references__edition',
'references__book_volume', 'references__book_volume',
'references__images', 'references__images',
'transmitters__status',
'transmitters__transmitter__reliability', 'transmitters__transmitter__reliability',
'transmitters__transmitter__kunyas',
'transmitters__uncertain_transmitters__reliability', 'transmitters__uncertain_transmitters__reliability',
'transmitters__uncertain_transmitters__kunyas',
'transmitters__narrator_layer', 'transmitters__narrator_layer',
'hadiscorrection_set__references__book_reference__author', 'hadiscorrection_set__references__book_reference__author',
'hadiscorrection_set__references__edition', 'hadiscorrection_set__references__edition',
@ -852,49 +936,85 @@ class Command(BaseCommand):
if ref_data.get('images'): if ref_data.get('images'):
ref_imgs_list.extend(ref_data['images']) ref_imgs_list.extend(ref_data['images'])
# 4. Narrators
# 4. Narrator Layers & Narrators
sorted_layers = sorted(
h.narrator_layers.all(),
key=lambda l: (l.number if l.number is not None else 0, l.id or 0),
)
layer_names = [
{
'id': layer.id,
'number': layer.number,
'slug': layer.slug,
'name': layer.name or [],
'description': layer.description or [],
}
for layer in sorted_layers
]
sorted_transmitters = sorted(
h.transmitters.all(),
key=lambda item: (
getattr(item, 'chain_index', 0) or 0,
item.order if item.order is not None else 0,
item.id or 0,
),
)
transmitters_data = [] transmitters_data = []
for tr in h.transmitters.all():
t = tr.transmitter
rel = t.reliability if t else None
for tr in sorted_transmitters:
layer_obj = tr.narrator_layer
uncertain_list = [] uncertain_list = []
if tr.is_uncertain: if tr.is_uncertain:
for ut in tr.uncertain_transmitters.all(): for ut in tr.uncertain_transmitters.all():
ut_rel = ut.reliability
uncertain_list.append({
'id': ut.id,
'name': ut.full_name,
'title': ut.full_name,
'slug': ut.slug,
'gender': ut.gender or '',
'birth_year_hijri': ut.birth_year_hijri or '',
'death_year_hijri': ut.death_year_hijri or '',
'reliability': {
'id': ut_rel.id,
'title': ut_rel.title,
'slug': ut_rel.slug,
'color': ut_rel.color,
'main_color_code': ut_rel.main_color_code,
} if ut_rel else None,
})
uncertain_list.append(self._serialize_narrator_person(ut))
has_uncertain = bool(tr.is_uncertain and len(uncertain_list) > 0)
t = None if has_uncertain else tr.transmitter
person_dict = self._serialize_narrator_person(t) if t else None
tr_status = getattr(tr, 'status', None)
tr_status_dict = {
'id': tr_status.id,
'title': tr_status.title,
'slug': tr_status.slug,
'color': tr_status.color,
'main_color_code': tr_status.main_color_code,
'description': getattr(tr_status, 'description', None),
} if tr_status else None
transmitters_data.append({ transmitters_data.append({
'id': t.id if t else None,
'name': t.full_name if t else None,
'title': t.full_name if t else None,
'slug': t.slug if t else None,
'gender': t.gender if t else '',
'birth_year_hijri': t.birth_year_hijri if t else '',
'death_year_hijri': t.death_year_hijri if t else '',
'id': person_dict['id'] if person_dict else None,
'hadis_transmitter_id': tr.id,
'order': tr.order,
'chain_index': getattr(tr, 'chain_index', 0),
'is_gap': bool(tr.is_gap),
'is_uncertain': bool(tr.is_uncertain),
'layer': layer_obj.slug if layer_obj else None,
'layer_slug': layer_obj.slug if layer_obj else None,
'layer_id': tr.narrator_layer_id, 'layer_id': tr.narrator_layer_id,
'is_uncertain': tr.is_uncertain,
'narrator_layer_id': tr.narrator_layer_id,
'layer_level': layer_obj.number if layer_obj else None,
'layer_name': layer_obj.name if layer_obj else None,
'name': person_dict['name'] if person_dict else None,
'title': person_dict['title'] if person_dict else None,
'full_name': person_dict['full_name'] if person_dict else None,
'arabic_full_name': person_dict['arabic_full_name'] if person_dict else '',
'slug': person_dict['slug'] if person_dict else None,
'known_as': person_dict['known_as'] if person_dict else [],
'arabic_known_as': person_dict['arabic_known_as'] if person_dict else '',
'nickname': person_dict['nickname'] if person_dict else [],
'arabic_nickname': person_dict['arabic_nickname'] if person_dict else '',
'kunya': person_dict['kunya'] if person_dict else [],
'arabic_kunya': person_dict['arabic_kunya'] if person_dict else '',
'gender': person_dict['gender'] if person_dict else '',
'birth_year_hijri': person_dict['birth_year_hijri'] if person_dict else '',
'death_year_hijri': person_dict['death_year_hijri'] if person_dict else '',
'birth_year_raw': person_dict['birth_year_raw'] if person_dict else '',
'death_year_raw': person_dict['death_year_raw'] if person_dict else '',
'reliability': person_dict['reliability'] if person_dict else None,
'uncertain_transmitters': uncertain_list, 'uncertain_transmitters': uncertain_list,
'reliability': {
'id': rel.id,
'title': rel.title,
'slug': rel.slug,
'color': rel.color,
'main_color_code': rel.main_color_code,
} if rel else None,
'status': tr_status_dict,
}) })
# 5. Explanations # 5. Explanations
@ -978,7 +1098,14 @@ class Command(BaseCommand):
json.dumps(tags_list, ensure_ascii=False), json.dumps(tags_list, ensure_ascii=False),
json.dumps(refs_list, ensure_ascii=False), json.dumps(refs_list, ensure_ascii=False),
json.dumps(ref_imgs_list, ensure_ascii=False), json.dumps(ref_imgs_list, ensure_ascii=False),
json.dumps({'transmitters': transmitters_data}, ensure_ascii=False),
json.dumps(
{
'layer_count': len(layer_names),
'layer_names': layer_names,
'transmitters': transmitters_data,
},
ensure_ascii=False,
),
json.dumps(explanations_data, ensure_ascii=False), json.dumps(explanations_data, ensure_ascii=False),
json.dumps(format_links_output(h.links), ensure_ascii=False), json.dumps(format_links_output(h.links), ensure_ascii=False),
)) ))

17
apps/hadis/serializers/hadis.py

@ -1301,12 +1301,15 @@ class HadisTransmitterSerializer(serializers.ModelSerializer):
transmitter = serializers.SerializerMethodField() transmitter = serializers.SerializerMethodField()
uncertain_transmitters = TransmitterShortSerializer(many=True, read_only=True) uncertain_transmitters = TransmitterShortSerializer(many=True, read_only=True)
layer = serializers.SerializerMethodField() layer = serializers.SerializerMethodField()
layer_slug = serializers.SerializerMethodField()
layer_id = serializers.IntegerField(source='narrator_layer_id', read_only=True)
status = serializers.SerializerMethodField() status = serializers.SerializerMethodField()
class Meta: class Meta:
model = HadisTransmitter model = HadisTransmitter
fields = [ fields = [
'id', 'order', 'is_gap', 'is_uncertain', 'layer', 'transmitter', 'uncertain_transmitters', 'status'
'id', 'order', 'is_gap', 'is_uncertain', 'layer', 'layer_slug', 'layer_id',
'transmitter', 'uncertain_transmitters', 'status'
] ]
def get_transmitter(self, obj): def get_transmitter(self, obj):
@ -1320,6 +1323,9 @@ class HadisTransmitterSerializer(serializers.ModelSerializer):
"""Get narrator layer slug""" """Get narrator layer slug"""
return obj.narrator_layer.slug if obj.narrator_layer else None return obj.narrator_layer.slug if obj.narrator_layer else None
def get_layer_slug(self, obj):
return obj.narrator_layer.slug if obj.narrator_layer else None
def get_status(self, obj): def get_status(self, obj):
"""Serialize the status foreign key""" """Serialize the status foreign key"""
if obj.status: if obj.status:
@ -1359,14 +1365,7 @@ class HadisTransmitterListSerializer(serializers.ModelSerializer):
def get_layer_names(self, obj): def get_layer_names(self, obj):
"""Get list of localized narrator layer names (bounded to avoid huge payloads)""" """Get list of localized narrator layer names (bounded to avoid huge payloads)"""
request = self.context.get('request') request = self.context.get('request')
layer_slug = request.query_params.get('layer') if request and hasattr(request, 'query_params') else None
layer_qs = obj.narrator_layers.all().order_by('number', 'id')
if layer_slug and layer_slug != 'all':
layer_objects = list(layer_qs.filter(slug=layer_slug)[:1])
if not layer_objects:
layer_objects = list(layer_qs[:20])
else:
layer_objects = list(layer_qs[:20])
layer_objects = list(obj.narrator_layers.all().order_by('number', 'id')[:50])
layer_names = [] layer_names = []
for layer in layer_objects: for layer in layer_objects:

14
apps/hadis/views/hadis.py

@ -861,9 +861,10 @@ class HadisTransmittersView(RetrieveAPIView):
'uncertain_transmitters__reliability', 'uncertain_transmitters__reliability',
'uncertain_transmitters__narrator_dates__year_value', 'uncertain_transmitters__narrator_dates__year_value',
'uncertain_transmitters__kunyas', 'uncertain_transmitters__kunyas',
).order_by('order')
).order_by('chain_index', 'order', 'id')
# 3. Apply the filter to the Child Query (if param exists, or default to first layer for scalability)
# 3. Apply the filter to the Child Query if a specific ?layer=<slug> is requested.
# When ?layer is omitted or ?layer=all, return all transmitters across all chains.
from ..models import NarratorLayer from ..models import NarratorLayer
hadis_slug = self.kwargs.get('hadis_slug') hadis_slug = self.kwargs.get('hadis_slug')
if layer_slug and layer_slug != 'all': if layer_slug and layer_slug != 'all':
@ -874,14 +875,11 @@ class HadisTransmittersView(RetrieveAPIView):
first_layer = NarratorLayer.objects.filter(hadis__slug=hadis_slug).order_by('number', 'id').first() first_layer = NarratorLayer.objects.filter(hadis__slug=hadis_slug).order_by('number', 'id').first()
if first_layer: if first_layer:
transmitter_qs = transmitter_qs.filter(narrator_layer_id=first_layer.id) transmitter_qs = transmitter_qs.filter(narrator_layer_id=first_layer.id)
elif not layer_slug:
first_layer = NarratorLayer.objects.filter(hadis__slug=hadis_slug).order_by('number', 'id').first()
if first_layer:
transmitter_qs = transmitter_qs.filter(narrator_layer_id=first_layer.id)
# 4. Use the Prefetch object to inject this filtered list into the Parent
# 4. Use the Prefetch object to inject this list into the Parent
return Hadis.objects.filter(status=True).prefetch_related( return Hadis.objects.filter(status=True).prefetch_related(
Prefetch('transmitters', queryset=transmitter_qs)
'narrator_layers',
Prefetch('transmitters', queryset=transmitter_qs),
) )
class HadisCorrectionsView(ListAPIView): class HadisCorrectionsView(ListAPIView):

Loading…
Cancel
Save