Merge pull request #15 from gravy-jones-locker/annotation-handling

Implemented Annotation Handling

Author: TimDumol

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: '^docs/conf.py'
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
   - id: trailing-whitespace
   - id: check-added-large-files
@@ -28,18 +28,18 @@ repos:
 #       --remove-unused-variables,
 #     ]
 - repo: https://github.com/hadialqattan/pycln
-  rev: v2.1.1
+  rev: v2.1.3
   hooks:
     - id: pycln
       args: [--config=setup.cfg]
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.10.1
+  rev: 5.12.0
   hooks:
   - id: isort
 
 - repo: https://github.com/psf/black
-  rev: 22.8.0
+  rev: 23.3.0
   hooks:
   - id: black
     language_version: python3
@@ -52,7 +52,7 @@ repos:
 #     additional_dependencies: [black]
 
 - repo: https://github.com/PyCQA/flake8
-  rev: 5.0.4
+  rev: 6.0.0
   hooks:
   - id: flake8
   ## You can add flake8 plugins via `additional_dependencies`:

src/strawberry_sqlalchemy_mapper/mapper.py

@@ -617,7 +617,18 @@ def convert(type_: Any) -> Any:
                     continue
                 if key in mapper.columns or key in mapper.relationships:
                     continue
-                if isinstance(descriptor, AssociationProxy):
+                if key in model.__annotations__:
+                    annotation = eval(model.__annotations__[key])
+                    for (
+                        sqlalchemy_type,
+                        strawberry_type,
+                    ) in self.sqlalchemy_type_to_strawberry_type_map.items():
+                        if isinstance(annotation, sqlalchemy_type):
+                            self._add_annotation(
+                                type_, key, strawberry_type, generated_field_keys
+                            )
+                            break
+                elif isinstance(descriptor, AssociationProxy):
                     strawberry_type = self._get_association_proxy_annotation(
                         mapper, key, descriptor
                     )