[WIP] Implemented OtherNested (name TBD)

Proof of concept only

Author: honzakral

elasticsearch_dsl/document.py

@@ -95,6 +95,13 @@ def init(self, index=None, using=None):
  def refresh(self, index=None, using=None):
  self.mapping.update_from_es(index or self.index, using=using or self.using)
 
+@add_metaclass(DocTypeMeta)
+class InnerDoc(ObjectBase):
+ """
+ Common class for inner documents like Object or Nested
+ """
+ pass
+
 
 @add_metaclass(DocTypeMeta)
 class DocType(ObjectBase):

elasticsearch_dsl/field.py

@@ -105,6 +105,50 @@ def __init__(self, mapping, **kwargs):
  super(AttrDict, self).__setattr__('_doc_type', type('Meta', (), {'mapping': mapping}))
  super(InnerObjectWrapper, self).__init__(**kwargs)
 
+class OtherNested(Field):
+ _coerce = True
+
+ def __init__(self, doc_class, **kwargs):
+ self._doc_class = doc_class
+ kwargs.setdefault('multi', True)
+ super(OtherNested, self).__init__(**kwargs)
+
+ def to_dict(self):
+ d = self._doc_class._doc_type.mapping.to_dict()
+ _, d = d.popitem()
+ d["type"] = "nested"
+ return d
+
+ def _collect_fields(self):
+ return self._doc_class._doc_type.mapping.properties._collect_fields()
+
+ def _deserialize(self, data):
+ if data is None:
+ return None
+ # don't wrap already wrapped data
+ if isinstance(data, self._doc_class):
+ return data
+
+ if isinstance(data, AttrDict):
+ data = data._d_
+
+ return self._doc_class(**data)
+
+ def _serialize(self, data):
+ if data is None:
+ return None
+ return data.to_dict()
+
+ def clean(self, data):
+ data = super(OtherNested, self).clean(data)
+ if data is None:
+ return None
+ if isinstance(data, (list, AttrList)):
+ for d in data:
+ d.full_clean()
+ else:
+ data.full_clean()
+ return data
 
 class InnerObject(object):
  " Common functionality for nested and object fields. "

test_elasticsearch_dsl/test_document.py

@@ -30,13 +30,12 @@ class MyDoc2(document.DocType):
 class MyMultiSubDoc(MyDoc2, MySubDoc):
  pass
 
+class Comment(document.InnerDoc):
+ title = field.Text()
+ tags = field.Keyword(multi=True)
+
 class DocWithNested(document.DocType):
- comments = field.Nested(
- properties={
- 'title': field.Text(),
- 'tags': field.Keyword(multi=True)
- }
- )
+ comments = field.OtherNested(Comment)
 
 class SimpleCommit(document.DocType):
  files = field.Text(multi=True)
@@ -240,8 +239,10 @@ def test_nested_can_be_assigned_to():
  d2 = DocWithNested()
 
  d2.comments = d1.comments
+ assert isinstance(d1.comments[0], Comment)
  assert d2.comments == [{'title': 'First!'}]
  assert {'comments': [{'title': 'First!'}]} == d2.to_dict()
+ assert isinstance(d2.comments[0], Comment)
 
 def test_nested_can_be_none():
  d = DocWithNested(comments=None, title='Hello World!')