work in progres pydantic_only and properties

tests/test_excluding_fields_in_fastapi.py

@@ -64,6 +64,8 @@ class RandomModel(ormar.Model):
         metadata = metadata
         database = database
 
+        include_props_in_fields = True
+
     id: int = ormar.Integer(primary_key=True)
     password: str = ormar.String(max_length=255, default=gen_pass)
     first_name: str = ormar.String(max_length=255, default="John")
@@ -72,6 +74,10 @@ class RandomModel(ormar.Model):
         server_default=sqlalchemy.func.now()
     )
 
+    @property
+    def full_name(self):
+        return ' '.join([self.first_name, self.last_name])
+
 
 class User(ormar.Model):
     class Meta:
@@ -136,6 +142,12 @@ async def create_user5(user: RandomModel):
     return await user.save()
 
 
+@app.post("/random2/", response_model=RandomModel)
+async def create_user6(user: RandomModel):
+    user = await user.save()
+    return user.dict()
+
+
 def test_all_endpoints():
     client = TestClient(app)
     with client as client:
@@ -187,4 +199,30 @@ def test_all_endpoints():
             "first_name",
             "last_name",
             "created_date",
+            "full_name"
+        ]
+        assert response.json().get("full_name") == "John Test"
+
+        RandomModel.Meta.include_props_in_fields = False
+        user3 = {"last_name": "Test"}
+        response = client.post("/random/", json=user3)
+        assert list(response.json().keys()) == [
+            "id",
+            "password",
+            "first_name",
+            "last_name",
+            "created_date",
+            "full_name"
+        ]
+
+        RandomModel.Meta.include_props_in_dict = True
+        user3 = {"last_name": "Test"}
+        response = client.post("/random2/", json=user3)
+        assert list(response.json().keys()) == [
+            "id",
+            "password",
+            "first_name",
+            "last_name",
+            "created_date",
+            "full_name"
         ]

tests/test_pydantic_only_fields.py

@@ -0,0 +1,75 @@
+import datetime
+
+import databases
+import pytest
+import sqlalchemy
+from pydantic import validator
+
+import ormar
+from tests.settings import DATABASE_URL
+
+database = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class Album(ormar.Model):
+    class Meta:
+        tablename = "albums"
+        metadata = metadata
+        database = database
+        include_props_in_dict = True
+        include_props_in_fields = True
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+    timestamp: datetime.datetime = ormar.DateTime(pydantic_only=True)
+
+    @property
+    def name10(self) -> str:
+        return self.name + '_10'
+
+    @validator('name')
+    def test(cls, v):
+        return v
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = sqlalchemy.create_engine(DATABASE_URL)
+    metadata.drop_all(engine)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@pytest.mark.asyncio
+async def test_pydantic_only_fields():
+    async with database:
+        async with database.transaction(force_rollback=True):
+            album = await Album.objects.create(name='Hitchcock')
+            assert album.pk is not None
+            assert album.saved
+            assert album.timestamp is None
+
+            album = await Album.objects.exclude_fields('timestamp').get()
+            assert album.timestamp is None
+
+            album = await Album.objects.fields({'name', 'timestamp'}).get()
+            assert album.timestamp is None
+
+            test_dict = album.dict()
+            assert 'timestamp' in test_dict
+            assert test_dict['timestamp'] is None
+
+            album.timestamp = datetime.datetime.now()
+            test_dict = album.dict()
+            assert 'timestamp' in test_dict
+            assert test_dict['timestamp'] is not None
+            assert test_dict.get('name10') == 'Hitchcock_10'
+
+            Album.Meta.include_props_in_dict = False
+            test_dict = album.dict()
+            assert 'timestamp' in test_dict
+            assert test_dict['timestamp'] is not None
+            # key is still there as now it's a field
+            assert test_dict['name10'] is None