Move restapi to the component

doc/conf.py

@@ -60,7 +60,7 @@ def __getattr__(cls, name):
 sys.modules['psutil'].boot_time = lambda: 0
 
 # Ignore ipv8/anydex/wallet endpoints
-from tribler_core.restapi.root_endpoint import RootEndpoint
+from tribler_core.components.restapi.rest.root_endpoint import RootEndpoint  # pylint: disable=wrong-import-position
 add_endpoint = RootEndpoint.add_endpoint
 RootEndpoint.add_endpoint = lambda self, path, ep: add_endpoint(self, path, ep) \
                                                    if path not in ['/ipv8', '/market', '/wallets'] else None

doc/extract_swagger.py

@@ -5,9 +5,9 @@
 
 import aiohttp
 
+from tribler_core.components.restapi.rest.rest_manager import ApiKeyMiddleware, RESTManager, error_middleware
 from tribler_core.config.tribler_config import TriblerConfig
-from tribler_core.restapi.rest_manager import ApiKeyMiddleware, error_middleware, RESTManager
-from tribler_core.restapi.root_endpoint import RootEndpoint
+from tribler_core.components.restapi.rest.root_endpoint import RootEndpoint
 
 import yaml
 

experiment/popularity_community/initial_filling.py

@@ -17,7 +17,7 @@
 from tribler_core.components.key.key_component import KeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.popularity.popularity_component import PopularityComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.socks_servers.socks_servers_component import SocksServersComponent
 from tribler_core.components.torrent_checker.torrent_checker_component import TorrentCheckerComponent
 from tribler_core.config.tribler_config import TriblerConfig

experiment/tunnel_community/hidden_peer_discovery.py

@@ -7,7 +7,7 @@
 from ipv8.taskmanager import TaskManager
 from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.tunnels import TunnelsComponent
 from tribler_core.config.tribler_config import TriblerConfig
 from tribler_core.utilities.tiny_tribler_service import TinyTriblerService

experiment/tunnel_community/speed_test_exit.py

@@ -7,7 +7,7 @@
 from ipv8.taskmanager import TaskManager
 from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.tunnels import TunnelsComponent
 from tribler_core.config.tribler_config import TriblerConfig
 from tribler_core.utilities.tiny_tribler_service import TinyTriblerService

src/seedbox/disseminator.py

@@ -34,7 +34,7 @@
 from tribler_core.components.key.key_component import KeyComponent
 from tribler_core.components.metadata_store.db.orm_bindings.channel_node import NEW
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.socks_servers.socks_servers_component import SocksServersComponent
 from tribler_core.config.tribler_config import TriblerConfig
 from tribler_core.components.libtorrent.torrentdef import TorrentDef

src/tribler-core/tribler_core/components/bandwidth_accounting/bandwidth_accounting_component.py

@@ -6,7 +6,7 @@
 )
 from tribler_core.components.bandwidth_accounting.db.database import BandwidthDatabase
 from tribler_core.components.ipv8.ipv8_component import Ipv8Component
-from tribler_core.components.restapi import RestfulComponent
+from tribler_core.components.restapi.restapi_component import RestfulComponent
 from tribler_core.components.upgrade import UpgradeComponent
 
 

src/tribler-core/tribler_core/components/bandwidth_accounting/restapi/bandwidth_endpoint.py

@@ -6,7 +6,7 @@
 
 from marshmallow.fields import Integer, String
 
-from tribler_core.restapi.rest_endpoint import HTTP_NOT_FOUND, RESTEndpoint, RESTResponse
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_NOT_FOUND, RESTEndpoint, RESTResponse
 from tribler_core.utilities.utilities import froze_it
 
 

src/tribler-core/tribler_core/components/bandwidth_accounting/tests/test_bandwidth_accounting_component.py

@@ -4,7 +4,7 @@
 from tribler_core.components.base import Session
 from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 
 
 # pylint: disable=protected-access

src/tribler-core/tribler_core/components/bandwidth_accounting/tests/test_bandwidth_endpoint.py

@@ -8,7 +8,7 @@
 from tribler_core.components.bandwidth_accounting.db.database import BandwidthDatabase
 from tribler_core.components.bandwidth_accounting.settings import BandwidthAccountingSettings
 from tribler_core.components.bandwidth_accounting.db.transaction import BandwidthTransactionData, EMPTY_SIGNATURE
-from tribler_core.restapi.base_api_test import do_request
+from tribler_core.components.restapi.rest.base_api_test import do_request
 from tribler_core.utilities.unicode import hexlify
 
 pytestmark = pytest.mark.asyncio

src/tribler-core/tribler_core/components/gigachannel/gigachannel_component.py

@@ -8,7 +8,7 @@
 from tribler_core.components.ipv8.ipv8_component import INFINITE, Ipv8Component
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
 from tribler_core.components.reporter.reporter_component import ReporterComponent
-from tribler_core.components.restapi import RestfulComponent
+from tribler_core.components.restapi.restapi_component import RestfulComponent
 
 
 class GigaChannelComponent(RestfulComponent):

src/tribler-core/tribler_core/components/gigachannel/tests/test_gigachannel_component.py

@@ -5,7 +5,7 @@
 from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.key.key_component import KeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.tag.tag_component import TagComponent
 
 

src/tribler-core/tribler_core/components/gigachannel_manager/gigachannel_manager_component.py

@@ -1,7 +1,7 @@
 from tribler_core.components.gigachannel_manager.gigachannel_manager import GigaChannelManager
 from tribler_core.components.libtorrent.libtorrent_component import LibtorrentComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
-from tribler_core.components.restapi import RestfulComponent
+from tribler_core.components.restapi.restapi_component import RestfulComponent
 
 
 class GigachannelManagerComponent(RestfulComponent):

src/tribler-core/tribler_core/components/gigachannel_manager/tests/test_gigachannel_manager_component.py

@@ -6,7 +6,7 @@
 from tribler_core.components.libtorrent.libtorrent_component import LibtorrentComponent
 from tribler_core.components.key.key_component import KeyComponent
 from tribler_core.components.metadata_store.metadata_store_component import MetadataStoreComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.socks_servers.socks_servers_component import SocksServersComponent
 from tribler_core.components.tag.tag_component import TagComponent
 

src/tribler-core/tribler_core/components/ipv8/ipv8_component.py

@@ -16,7 +16,7 @@
 from ipv8_service import IPv8
 
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RestfulComponent
+from tribler_core.components.restapi.restapi_component import RestfulComponent
 
 INFINITE = -1
 

src/tribler-core/tribler_core/components/ipv8/tests/test_ipv8_component.py

@@ -3,7 +3,7 @@
 from tribler_core.components.base import Session
 from tribler_core.components.ipv8.ipv8_component import Ipv8Component
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 
 pytestmark = pytest.mark.asyncio
 

src/tribler-core/tribler_core/components/libtorrent/libtorrent_component.py

@@ -2,7 +2,7 @@
 
 from tribler_core.components.libtorrent.download_manager.download_manager import DownloadManager
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RestfulComponent
+from tribler_core.components.restapi.restapi_component import RestfulComponent
 from tribler_core.components.socks_servers.socks_servers_component import SocksServersComponent
 from tribler_core.components.upgrade import UpgradeComponent
 

src/tribler-core/tribler_core/components/libtorrent/restapi/create_torrent_endpoint.py

@@ -9,12 +9,12 @@
 
 from marshmallow.fields import String
 
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, RESTEndpoint, RESTResponse
+from tribler_core.components.restapi.rest.schema import HandledErrorSchema
+from tribler_core.components.restapi.rest.util import return_handled_exception
 from tribler_core.exceptions import DuplicateDownloadException
 from tribler_core.components.libtorrent.download_manager.download_config import DownloadConfig
 from tribler_core.components.libtorrent.torrentdef import TorrentDef
-from tribler_core.restapi.rest_endpoint import HTTP_BAD_REQUEST, RESTEndpoint, RESTResponse
-from tribler_core.restapi.schema import HandledErrorSchema
-from tribler_core.restapi.util import return_handled_exception
 from tribler_core.utilities.path_util import Path
 from tribler_core.utilities.unicode import ensure_unicode, recursive_bytes
 from tribler_core.utilities.utilities import bdecode_compat, froze_it

src/tribler-core/tribler_core/components/libtorrent/restapi/downloads_endpoint.py

@@ -23,16 +23,11 @@
 from tribler_core.components.libtorrent.download_manager.download_config import DownloadConfig
 from tribler_core.components.libtorrent.download_manager.download_manager import DownloadManager
 from tribler_core.components.libtorrent.download_manager.stream import STREAM_PAUSE_TIME, StreamChunk
-from tribler_core.restapi.rest_endpoint import (
-    HTTP_BAD_REQUEST,
-    HTTP_INTERNAL_SERVER_ERROR,
-    HTTP_NOT_FOUND,
-    RESTEndpoint,
-    RESTResponse,
-    RESTStreamResponse,
-)
-from tribler_core.restapi.util import return_handled_exception
 from tribler_core.components.libtorrent.utils.libtorrent_helper import libtorrent as lt
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, HTTP_INTERNAL_SERVER_ERROR, \
+    HTTP_NOT_FOUND, RESTEndpoint, \
+    RESTResponse, RESTStreamResponse
+from tribler_core.components.restapi.rest.util import return_handled_exception
 from tribler_core.utilities.path_util import Path
 from tribler_core.utilities.unicode import ensure_unicode, hexlify
 from tribler_core.utilities.utilities import froze_it

src/tribler-core/tribler_core/components/libtorrent/restapi/libtorrent_endpoint.py

@@ -8,7 +8,7 @@
 
 from marshmallow.fields import Integer
 
-from tribler_core.restapi.rest_endpoint import RESTEndpoint, RESTResponse
+from tribler_core.components.restapi.rest.rest_endpoint import RESTEndpoint, RESTResponse
 from tribler_core.utilities.unicode import hexlify
 from tribler_core.utilities.utilities import froze_it
 

src/tribler-core/tribler_core/components/libtorrent/restapi/tests/test_downloads_endpoint.py

@@ -12,8 +12,8 @@
 
 from tribler_core.components.libtorrent.download_manager.download_state import DownloadState
 from tribler_core.components.libtorrent.restapi.downloads_endpoint import DownloadsEndpoint, get_extended_status
-from tribler_core.restapi.base_api_test import do_request
-from tribler_core.restapi.rest_manager import error_middleware
+from tribler_core.components.restapi.rest.base_api_test import do_request
+from tribler_core.components.restapi.rest.rest_manager import error_middleware
 from tribler_core.tests.tools.common import TESTS_DATA_DIR
 from tribler_core.utilities.unicode import hexlify
 

src/tribler-core/tribler_core/components/libtorrent/restapi/tests/test_libtorrent_endpoint.py

@@ -5,8 +5,8 @@
 import pytest
 
 from tribler_core.components.libtorrent.restapi.libtorrent_endpoint import LibTorrentEndpoint
-from tribler_core.restapi.base_api_test import do_request
-from tribler_core.restapi.rest_manager import error_middleware
+from tribler_core.components.restapi.rest.base_api_test import do_request
+from tribler_core.components.restapi.rest.rest_manager import error_middleware
 from tribler_core.utilities.unicode import hexlify
 
 

src/tribler-core/tribler_core/components/libtorrent/restapi/tests/test_torrentinfo_endpoint.py

@@ -16,8 +16,8 @@
 from tribler_core.components.libtorrent.restapi.torrentinfo_endpoint import TorrentInfoEndpoint
 from tribler_core.components.libtorrent.torrentdef import TorrentDef
 from tribler_core.components.metadata_store.db.orm_bindings.torrent_metadata import tdef_to_metadata_dict
-from tribler_core.restapi.base_api_test import do_request
-from tribler_core.restapi.rest_manager import error_middleware
+from tribler_core.components.restapi.rest.base_api_test import do_request
+from tribler_core.components.restapi.rest.rest_manager import error_middleware
 from tribler_core.tests.tools.common import TESTS_DATA_DIR, TESTS_DIR, TORRENT_UBUNTU_FILE, UBUNTU_1504_INFOHASH
 from tribler_core.utilities.unicode import hexlify
 

src/tribler-core/tribler_core/components/libtorrent/restapi/torrentinfo_endpoint.py

@@ -15,8 +15,9 @@
 
 from tribler_core.components.libtorrent.torrentdef import TorrentDef
 from tribler_core.components.metadata_store.db.orm_bindings.torrent_metadata import tdef_to_metadata_dict
-from tribler_core.restapi.rest_endpoint import HTTP_BAD_REQUEST, HTTP_INTERNAL_SERVER_ERROR, RESTEndpoint, RESTResponse
 from tribler_core.components.libtorrent.utils.libtorrent_helper import libtorrent as lt
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, HTTP_INTERNAL_SERVER_ERROR, \
+    RESTEndpoint, RESTResponse
 from tribler_core.utilities.unicode import hexlify, recursive_unicode
 from tribler_core.utilities.utilities import bdecode_compat, froze_it, parse_magnetlink
 

src/tribler-core/tribler_core/components/libtorrent/tests/test_libtorrent_component.py

@@ -3,7 +3,7 @@
 from tribler_core.components.base import Session
 from tribler_core.components.libtorrent.libtorrent_component import LibtorrentComponent
 from tribler_core.components.key.key_component import KeyComponent
-from tribler_core.components.restapi import RESTComponent
+from tribler_core.components.restapi.restapi_component import RESTComponent
 from tribler_core.components.socks_servers.socks_servers_component import SocksServersComponent
 
 pytestmark = pytest.mark.asyncio

src/tribler-core/tribler_core/components/metadata_store/metadata_store_component.py

@@ -3,7 +3,7 @@
 from tribler_core.components.key.key_component import KeyComponent
 from tribler_core.components.metadata_store.db.store import MetadataStore
 from tribler_core.components.metadata_store.utils import generate_test_channels
-from tribler_core.components.restapi import RestfulComponent
+from tribler_core.components.restapi.restapi_component import RestfulComponent
 from tribler_core.components.tag.tag_component import TagComponent
 from tribler_core.components.upgrade import UpgradeComponent
 

src/tribler-core/tribler_core/components/metadata_store/restapi/channels_endpoint.py

@@ -23,8 +23,8 @@
 from tribler_core.components.metadata_store.restapi.metadata_schema import ChannelSchema, MetadataSchema, TorrentSchema
 from tribler_core.components.metadata_store.db.serialization import CHANNEL_TORRENT, REGULAR_TORRENT
 from tribler_core.components.metadata_store.utils import NoChannelSourcesException, RequestTimeoutException
-from tribler_core.restapi.rest_endpoint import HTTP_BAD_REQUEST, HTTP_NOT_FOUND, RESTResponse
-from tribler_core.restapi.schema import HandledErrorSchema
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, HTTP_NOT_FOUND, RESTResponse
+from tribler_core.components.restapi.rest.schema import HandledErrorSchema
 from tribler_core.utilities.unicode import hexlify
 from tribler_core.utilities.utilities import froze_it, is_infohash, parse_magnetlink
 

src/tribler-core/tribler_core/components/metadata_store/restapi/metadata_endpoint.py

@@ -4,6 +4,7 @@
 
 from aiohttp_apispec import docs
 
+from ipv8.REST.base_endpoint import HTTP_BAD_REQUEST, HTTP_NOT_FOUND
 from ipv8.REST.schema import schema
 
 from marshmallow.fields import Integer, String
@@ -12,8 +13,8 @@
 
 from tribler_core.components.metadata_store.db.orm_bindings.channel_node import LEGACY_ENTRY
 from tribler_core.components.metadata_store.restapi.metadata_endpoint_base import MetadataEndpointBase
-from tribler_core.restapi.rest_endpoint import HTTP_BAD_REQUEST, HTTP_NOT_FOUND, RESTResponse
-from tribler_core.restapi.schema import HandledErrorSchema
+from tribler_core.components.restapi.rest.rest_endpoint import RESTResponse
+from tribler_core.components.restapi.rest.schema import HandledErrorSchema
 from tribler_core.utilities.unicode import hexlify
 from tribler_core.utilities.utilities import froze_it
 

src/tribler-core/tribler_core/components/metadata_store/restapi/metadata_endpoint_base.py

@@ -5,8 +5,8 @@
 
 from tribler_core.components.metadata_store.category_filter.family_filter import default_xxx_filter
 from tribler_core.components.metadata_store.db.serialization import CHANNEL_TORRENT, COLLECTION_NODE, REGULAR_TORRENT
+from tribler_core.components.restapi.rest.rest_endpoint import RESTEndpoint
 from tribler_core.components.tag.db.tag_db import TagDatabase
-from tribler_core.restapi.rest_endpoint import RESTEndpoint
 
 # This dict is used to translate JSON fields into the columns used in Pony for _sorting_.
 # id_ is not in the list because there is not index on it, so we never really want to sort on it.

src/tribler-core/tribler_core/components/metadata_store/restapi/remote_query_endpoint.py

@@ -13,7 +13,7 @@
 
 from tribler_core.components.metadata_store.restapi.metadata_endpoint import MetadataEndpointBase
 from tribler_core.components.metadata_store.restapi.metadata_schema import RemoteQueryParameters
-from tribler_core.restapi.rest_endpoint import HTTP_BAD_REQUEST, RESTResponse
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, RESTResponse
 from tribler_core.utilities.unicode import hexlify
 from tribler_core.utilities.utilities import froze_it
 

src/tribler-core/tribler_core/components/metadata_store/restapi/search_endpoint.py

@@ -11,7 +11,7 @@
 from tribler_core.components.metadata_store.restapi.metadata_endpoint import MetadataEndpointBase
 from tribler_core.components.metadata_store.restapi.metadata_schema import MetadataParameters, MetadataSchema
 from tribler_core.components.metadata_store.db.store import MetadataStore
-from tribler_core.restapi.rest_endpoint import HTTP_BAD_REQUEST, RESTResponse
+from tribler_core.components.restapi.rest.rest_endpoint import HTTP_BAD_REQUEST, RESTResponse
 from tribler_core.utilities.utilities import froze_it
 
 

src/tribler-core/tribler_core/components/metadata_store/restapi/tests/test_channels_endpoint.py

@@ -21,8 +21,8 @@
 from tribler_core.components.metadata_store.restapi.channels_endpoint import ChannelsEndpoint
 from tribler_core.components.metadata_store.db.serialization import CHANNEL_TORRENT, COLLECTION_NODE, REGULAR_TORRENT
 from tribler_core.components.metadata_store.utils import RequestTimeoutException, tag_torrent
-from tribler_core.restapi.base_api_test import do_request
-from tribler_core.restapi.rest_manager import error_middleware
+from tribler_core.components.restapi.rest.base_api_test import do_request
+from tribler_core.components.restapi.rest.rest_manager import error_middleware
 from tribler_core.tests.tools.common import TORRENT_UBUNTU_FILE
 from tribler_core.utilities.random_utils import random_infohash
 from tribler_core.utilities.unicode import hexlify

src/tribler-core/tribler_core/components/metadata_store/restapi/tests/test_metadata_endpoint.py

@@ -9,12 +9,12 @@
 
 import pytest
 
+from tribler_core.components.restapi.rest.base_api_test import do_request
+from tribler_core.components.restapi.rest.rest_manager import error_middleware
 from tribler_core.components.torrent_checker.torrent_checker.torrent_checker import TorrentChecker
 from tribler_core.config.tribler_config import TriblerConfig
 from tribler_core.components.metadata_store.db.orm_bindings.channel_node import COMMITTED, TODELETE, UPDATED
 from tribler_core.components.metadata_store.restapi.metadata_endpoint import MetadataEndpoint, TORRENT_CHECK_TIMEOUT
-from tribler_core.restapi.base_api_test import do_request
-from tribler_core.restapi.rest_manager import error_middleware
 from tribler_core.utilities.random_utils import random_infohash
 from tribler_core.utilities.unicode import hexlify
 from tribler_core.utilities.utilities import has_bep33_support

src/tribler-core/tribler_core/components/metadata_store/restapi/tests/test_remote_query_endpoint.py

@@ -12,8 +12,8 @@
 
 from tribler_core.components.gigachannel.community.gigachannel_community import ChannelsPeersMapping
 from tribler_core.components.metadata_store.restapi.remote_query_endpoint import RemoteQueryEndpoint
-from tribler_core.restapi.base_api_test import do_request
-from tribler_core.restapi.rest_manager import error_middleware
+from tribler_core.components.restapi.rest.base_api_test import do_request
+from tribler_core.components.restapi.rest.rest_manager import error_middleware
 from tribler_core.utilities.random_utils import random_infohash
 from tribler_core.utilities.unicode import hexlify
 

src/tribler-core/tribler_core/components/metadata_store/restapi/tests/test_search_endpoint.py

@@ -5,7 +5,7 @@
 import pytest
 
 from tribler_core.components.metadata_store.restapi.search_endpoint import SearchEndpoint
-from tribler_core.restapi.base_api_test import do_request
+from tribler_core.components.restapi.rest.base_api_test import do_request
 from tribler_core.utilities.random_utils import random_infohash