Merge pull request #12 from Ensembl/fix-type-field

Fix type field

Author: bilalebi

app/api/models/resolver.py

@@ -1,4 +1,4 @@
-from typing import Optional, Literal, List
+from typing import Optional, Literal, List, Dict
 from pydantic import BaseModel, Field
 
 
@@ -31,7 +31,8 @@ class MetadataResult(BaseModel):
     assembly: Assembly
     scientific_name: str
     common_name: str
-    type: Optional[str] = None
+    type: Optional[Dict[str, str]] = None
+    is_reference: bool = False
 
 
 class ResolvedPayload(MetadataResult):

app/api/resources/templates/search_results.html

@@ -21,8 +21,17 @@ <h1>Resolved URLs</h1>
           <td>{{ item.assembly.accession_id }}</td>
           <td>{{ item.scientific_name }}</td>
           <td>{{ item.common_name }}</td>
-          <td>{{ item.species }}</td>
-          <td>{{ item.type }}</td>
+          <td>
+            {% if item.type and item.is_reference %}
+              {{ item.type.kind }} - {{ item.type.value }}, Reference
+            {% elif item.is_reference %}
+              Reference
+            {% elif item.type %}
+              {{ item.type.kind }} - {{ item.type.value }}
+            {% else %}
+              -
+            {% endif %}
+          </td>
           <td>
             <a href="{{ item.resolved_url }}">Ensembl</a>
           </td>

app/static/APISpecification.yaml

@@ -87,6 +87,9 @@ paths:
                     resolved_url:
                       type: string
                       description: Resolved url to Ensembl site
+                    is_reference:
+                      type: boolean
+                      description: Whether a genome is reference or not
         '302':
           description: Redirect to resolved URL
           headers:

requirements-dev.txt

@@ -1,4 +1,3 @@
 -r requirements.txt
-pre-commit=3.8.0
-black=24.8.0
-flake8==7.1.1
+pre-commit==3.8.0
+black==24.8.0