<commit_before>from datetime import datetime

import colander
from flask import url_for

from grano.core import db
from grano.logic import files as files_logic
from grano.logic.validation import FixedValue
<<<<<<< HEAD
from grano.model import Entity, Attribute, File
=======
from grano.model import Entity, Property
>>>>>>> master


DATATYPE_TYPES = {
    'integer': colander.Integer(),
    'float': colander.Float(),
    'boolean': colander.Boolean(),
    'string': colander.String(),
    'datetime': colander.DateTime(default_tzinfo=None),
    'file': colander.Integer()
}<commit_msg>missed merge conflict<commit_after>from datetime import datetime

import colander
from flask import url_for

from grano.core import db
from grano.logic import files as files_logic
from grano.logic.validation import FixedValue
from grano.model import Entity, Attribute, File, Property


DATATYPE_TYPES = {
    'integer': colander.Integer(),
    'float': colander.Float(),
    'boolean': colander.Boolean(),
    'string': colander.String(),
    'datetime': colander.DateTime(default_tzinfo=None),
    'file': colander.Integer()
}
{'fraction_non_alphanumeric': 0.12039532794249776, 'fraction_numerical': 0.0, 'mean_word_length': 5.087431693989071, 'pattern_counts': {'":': 0, '<': 10, '<?xml version=': 0, '>': 10, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '1428971', 'n_tokens_mistral': 336, 'n_tokens_neox': 326, 'n_words': 96}