Skip to content

Commit

Permalink
Sort imports
Browse files Browse the repository at this point in the history
  • Loading branch information
njf0 committed Mar 14, 2024
1 parent 085e886 commit ce4a929
Show file tree
Hide file tree
Showing 44 changed files with 225 additions and 177 deletions.
1 change: 1 addition & 0 deletions frank/cache/logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

from frank import config
from frank.alist import Alist

# from frank.cache import neo4j, redis
# from frank.cache.redis import RedisClientPool

Expand Down
5 changes: 3 additions & 2 deletions frank/cache/neo4j.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
'''

from neo4j import GraphDatabase

from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.alist import States as states
from frank.alist import Branching as branching
from frank import config
from frank.alist import States as states


def get_driver():
Expand Down
4 changes: 2 additions & 2 deletions frank/context.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from datetime import datetime

from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.alist import Contexts as ctx
from frank.kb import wikidata
from frank.kb import worldbank
from frank.kb import wikidata, worldbank


def get_user_context(alist, key):
Expand Down
4 changes: 2 additions & 2 deletions frank/explain.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
'''

from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.alist import States as states
from frank.alist import Branching as branching
from frank.alist import NodeTypes as nt
from frank import config
from frank.alist import States as states
from frank.graph import InferenceGraph


Expand Down
2 changes: 1 addition & 1 deletion frank/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import plotly.graph_objects as go

from frank.alist import Alist
from frank.alist import States as st
from frank.alist import NodeTypes as nt
from frank.alist import States as st


class InferenceGraph(nx.DiGraph):
Expand Down
18 changes: 9 additions & 9 deletions frank/infer.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import time

import frank.cache.logger as clogger
import frank.context
import frank.map.map_wrapper
import frank.processLog as plog
from frank.processLog import pcolors as pcol
import frank.reduce.comp
import frank.reduce.eq
import frank.reduce.gpregress
Expand All @@ -31,20 +31,20 @@
import frank.reduce.sum
import frank.reduce.value
import frank.reduce.values
from frank.util import utils
from frank import config, processLog
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.alist import Branching as br
from frank.alist import Contexts as ctx
from frank.alist import NodeTypes as nt
from frank.alist import States as states
from frank import config
from frank.kb import rdf, wikidata, worldbank, musicbrainz, jsonld
from .explain import Explanation
from frank import processLog
from frank.uncertainty.sourcePrior import SourcePrior as sourcePrior
import frank.context
from frank.alist import Contexts as ctx
from frank.graph import InferenceGraph
from frank.kb import jsonld, musicbrainz, rdf, wikidata, worldbank
from frank.processLog import pcolors as pcol
from frank.uncertainty.sourcePrior import SourcePrior as sourcePrior
from frank.util import utils

from .explain import Explanation


class Infer:
Expand Down
6 changes: 4 additions & 2 deletions frank/kb/conceptnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
'''

import requests
import urllib.parse

import requests

from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank import config


def search_properties(search_term):
Expand Down
16 changes: 8 additions & 8 deletions frank/kb/jsonld.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
from typing import List, Any, Tuple, Optional
from pyld import jsonld
from bs4 import BeautifulSoup
import json
import logging
from itertools import chain
from typing import Any, List, Optional, Tuple

from bs4 import BeautifulSoup
from pyld import jsonld

from frank.config import config
from frank.util.utils import listify, filter_out_falsy
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.config import config
from frank.kb import KB
from frank.kb.meta import Entity, Relationship
from frank.kb.extensions.schemaorg import get_schema as get_schemaorg_schema
from frank.kb.utils.requests import requests
from frank.kb.meta import Entity, Relationship
from frank.kb.utils.link_crawler import crawl_graph, crawl_soup

from frank.kb.utils.requests import requests
from frank.util.utils import filter_out_falsy, listify

# jsonld.set_document_loader(jsonld.requests_document_loader(headers={
# 'Accept': 'application/ld+json, application/json',
Expand Down
1 change: 1 addition & 0 deletions frank/kb/mongo.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
'''

from pymongo import MongoClient

from frank import config


Expand Down
8 changes: 5 additions & 3 deletions frank/kb/musicbrainz.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
'''

import requests
from datetime import datetime
import urllib.parse
from datetime import datetime

import requests

from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank import config

#format : artist sang/recorded title in date

Expand Down
6 changes: 4 additions & 2 deletions frank/kb/rdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
'''

import requests
import urllib.parse

import requests

from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank import config


def find_sub_location(entity: str):
Expand Down
15 changes: 8 additions & 7 deletions frank/kb/wikidata.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
'''

import requests
import difflib
import urllib.parse
from datetime import datetime

import requests
from pymongo import MongoClient

import frank.dataloader
import frank.util.utils
from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank import config
from frank.kb import mongo
from frank.kb import conceptnet
import frank.util.utils
from datetime import datetime
import frank.dataloader
from frank.kb import conceptnet, mongo


def search_properties(search_term):
Expand Down
11 changes: 6 additions & 5 deletions frank/kb/worldbank.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
'''

import requests
import urllib.parse

import requests

import frank.dataloader
from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.kb import rdf
from frank.kb import mongo
from frank import config
import frank.dataloader
from frank.kb import mongo, rdf

indicators = {
"population": "SP.POP.TOTL",
Expand Down
14 changes: 7 additions & 7 deletions frank/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
'''
import json
import threading
import time
import timeit
import uuid
import json
import threading
from frank.infer import Infer

import frank.context
from frank import config
from frank.alist import Alist
from frank.alist import Attributes as tt
from frank.alist import States as states
from frank.alist import Branching as branching
from frank import config
from frank.util import utils
from frank.alist import States as states
from frank.graph import InferenceGraph
from frank.infer import Infer
from frank.processLog import pcolors as pcol
import frank.context
from frank.util import utils


class Launcher():
Expand Down
7 changes: 4 additions & 3 deletions frank/map/comparison.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
# import _context
from frank.alist import Alist as A
from frank.alist import Attributes as tt
from frank.alist import VarPrefix as vx
from frank.alist import Branching as br
from frank.alist import States as states
from frank.alist import NodeTypes as nt
from .map import Map
from frank.alist import States as states
from frank.alist import VarPrefix as vx
from frank.graph import InferenceGraph

from .map import Map


class Comparison(Map):
def __init__(self):
Expand Down
10 changes: 6 additions & 4 deletions frank/map/geospatial.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@
# import _context
import datetime
import math

from frank import config
from frank.alist import Alist as A
from frank.alist import Attributes as tt
from frank.alist import VarPrefix as vx
from frank.alist import Branching as br
from frank.alist import States as states
from frank.alist import NodeTypes as nt
from .map import Map
from frank.kb import rdf
from frank.alist import States as states
from frank.alist import VarPrefix as vx
from frank.graph import InferenceGraph
from frank.kb import rdf

from .map import Map


class Geospatial(Map):
Expand Down
1 change: 1 addition & 0 deletions frank/map/map.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
'''
import abc
from abc import ABC, abstractmethod

# from frank.alist import Alist


Expand Down
5 changes: 3 additions & 2 deletions frank/map/map_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
'''

from frank.map.comparison import Comparison
from frank.map.geospatial import Geospatial
from frank.map.temporal import Temporal
from frank.map.normalize import Normalize
from frank.map.comparison import Comparison
from frank.map.temporal import Temporal

# from frank.map.isa import IsA


Expand Down
9 changes: 5 additions & 4 deletions frank/map/normalize.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
Copyright 2014 - 2020 Kobby K.A. Nuamah
'''

import frank.context
# import _context
from frank.alist import Alist as A
from frank.alist import Attributes as tt
from frank.alist import VarPrefix as vx
from frank.alist import Branching as br
from frank.alist import States as states
from frank.alist import NodeTypes as nt
from frank.alist import States as states
from frank.alist import VarPrefix as vx
from frank.graph import InferenceGraph
from frank.kb import rdf

from .map import Map
from frank.graph import InferenceGraph
import frank.context


class Normalize(Map):
Expand Down
10 changes: 6 additions & 4 deletions frank/map/temporal.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,20 @@
# import _context
import datetime
import math

import frank.config as config
import frank.context
from frank.alist import Alist as A
from frank.alist import Attributes as tt
from frank.alist import VarPrefix as vx
from frank.alist import Branching as br
from frank.alist import States as states
from frank.alist import Contexts as ctx
from frank.alist import NodeTypes as nt
from .map import Map
import frank.context
from frank.alist import States as states
from frank.alist import VarPrefix as vx
from frank.graph import InferenceGraph

from .map import Map


class Temporal(Map):

Expand Down
1 change: 1 addition & 0 deletions frank/query_parser/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import spacy


class Parser:
"""Parser class for NL queries."""
def __init__(
Expand Down
Loading

0 comments on commit ce4a929

Please sign in to comment.