Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmonakhov
vmonakhov committed Mar 25, 2024
1 parent d901c6a commit 6a63646
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 62 deletions.
3 changes: 2 additions & 1 deletion lingvodoc/schema/gql_dictionary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,8 @@ def mutate(root, info, **args):
if self_id:
parent_field = CreateDictionary.get_by_fake_id(field_fake_ids, self_id)
self_id = (parent_field.client_id, parent_field.object_id)
persp_to_field = create_dictionary_persp_to_field(id=(client_id, None),
persp_to_field = create_dictionary_persp_to_field(
id=(client_id, None),
parent_id=parent_id,
field_id=field_id,
self_id=self_id,
Expand Down
5 changes: 1 addition & 4 deletions lingvodoc/scripts/initializedb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@

from sqlalchemy import engine_from_config

from lingvodoc.utils.creation import (create_perspective,
create_dbdictionary,
create_dictionary_persp_to_field,
edit_role,
from lingvodoc.utils.creation import (edit_role,
create_lexicalentry
)
from lingvodoc.utils.starling_converter import create_entity
Expand Down
2 changes: 1 addition & 1 deletion lingvodoc/utils/plain_text_converter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def convert_start(ids, corpus_inf, columns_inf, cache_kwargs, sqlalchemy_url, ta

perspective_id = [new_persp.client_id, new_persp.object_id]

for position, field_id in enumerate(columns_dict):
for position, field_id in enumerate(columns_dict, 1):
create_dictionary_persp_to_field(id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
Expand Down
101 changes: 45 additions & 56 deletions lingvodoc/utils/starling_converter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
import string
import collections
import transaction
import datetime
from collections import defaultdict
from itertools import chain
import logging
import traceback
import pprint
import csv
import urllib
import io
Expand All @@ -29,29 +26,17 @@
)
from lingvodoc.utils.creation import create_gists_with_atoms, update_metadata, add_user_to_group
from lingvodoc.schema.gql_holders import (
LingvodocObjectType,
CommonFieldsComposite,
StateHolder,
TranslationHolder,
fetch_object,
del_object,
client_id_check,
ResponseError,
ObjectVal,
acl_check_by_id,
LingvodocID,
UserAndOrganizationsRoles
LingvodocID
)

from lingvodoc.utils import statistics
from lingvodoc.utils.creation import (create_perspective,
create_dbdictionary,
create_dictionary_persp_to_field,
edit_role,
create_group_entity)
from lingvodoc.utils.search import translation_gist_search, get_id_to_field_dict
create_dictionary_persp_to_field)
from lingvodoc.utils.search import get_id_to_field_dict

from lingvodoc.scripts.convert_five_tiers import convert_all
from lingvodoc.queue.celery import celery

from lingvodoc.cache.caching import CACHE
Expand Down Expand Up @@ -621,14 +606,16 @@ def convert_start(ids, starling_dictionaries, cache_kwargs, sqlalchemy_url, task
continue
else:
fields_fix.add(field_id)
persp_to_field = create_dictionary_persp_to_field(id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
upper_level=None,
link_id=None,
position=position_counter
)

create_dictionary_persp_to_field(
id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
upper_level=None,
link_id=None,
position=position_counter)
position_counter += 1

starlingname_to_column[starling_name] = field_id
keep_field_dict[blob_id][field_id] = starling_name
elif starling_type == 2:
Expand All @@ -638,49 +625,51 @@ def convert_start(ids, starling_dictionaries, cache_kwargs, sqlalchemy_url, task
continue
else:
fields_fix.add(field_id)
# copy
persp_to_field = create_dictionary_persp_to_field(id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
upper_level=None,
link_id=None,
position=position_counter
)

create_dictionary_persp_to_field(
id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
upper_level=None,
link_id=None,
position=position_counter)
position_counter += 1

starlingname_to_column[starling_name] = field_id
copy_field_dict[blob_id][field_id] = starling_name
elif starling_type == 4:
persp_to_field = create_dictionary_persp_to_field(id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
upper_level=None,
link_id=None,
position=position_counter
)
position_counter += 1

create_dictionary_persp_to_field(
id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=field_id,
upper_level=None,
link_id=None,
position=position_counter)
position_counter += 1

add_etymology = starling_dictionary.get("add_etymology")
if add_etymology:
persp_to_field = create_dictionary_persp_to_field(id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=etymology_field_id,
upper_level=None,
link_id=None,
position=position_counter
)
create_dictionary_persp_to_field(
id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=etymology_field_id,
upper_level=None,
link_id=None,
position=position_counter)
position_counter += 1

etymology_blobs.add(blob_id)

if starling_flag:

persp_to_field = create_dictionary_persp_to_field(id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=relation_field_id,
upper_level=None,
link_id=None,
position=position_counter
)
create_dictionary_persp_to_field(
id=obj_id.id_pair(client_id),
parent_id=perspective_id,
field_id=relation_field_id,
upper_level=None,
link_id=None,
position=position_counter)
position_counter += 1

fields_marked_as_links = [x.get("starling_name") for x in fields if x.get("starling_type") == 3]
link_field_dict[blob_id] = fields_marked_as_links
Expand Down

0 comments on commit 6a63646

Please sign in to comment.