From 966200132fa24527d2adefc6e28d7a193aa551b6 Mon Sep 17 00:00:00 2001
From: Ivan Vazhenin <wolf.ivn@yandex.ru>
Date: Mon, 5 Feb 2024 20:25:45 +0300
Subject: [PATCH] Update config

---
 config.py                          | 4 ++++
 main.py                            | 7 ++-----
 reqs/graphql.py => reqs_graphql.py | 5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename reqs/graphql.py => reqs_graphql.py (92%)

diff --git a/config.py b/config.py
index 29dfdf3..cff5984 100644
--- a/config.py
+++ b/config.py
@@ -33,3 +33,7 @@ class Config:
     s3_key_id: str = 's57'
     s3_access_key: str = 'd9MMinLF3U8TLSj'
     s3_bucket: str = 'files'
+
+    gql_url: str = 'https://gql.ivazh.ru/graphql'
+    gql_download: str = 'https://gql.ivazh.ru/item/{key}'
+    gql_schema: str = 'pdim'
diff --git a/main.py b/main.py
index 93b7492..205e140 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,5 @@
-import asyncio
 from tempfile import TemporaryDirectory
 import pika
-import sys
 import threading
 import time
 from queue import Queue
@@ -11,12 +9,11 @@ from uuid import uuid4, UUID
 from xmlrpc.server import SimpleXMLRPCServer
 from xmlrpc.client import ServerProxy
 import logging
-import os
 import io
 import zlib
 import os.path
 import requests
-from reqs.graphql import get_catalog, get_object
+from reqs_graphql import get_catalog, get_object
 from pygost import gost34112012256
 import xml.etree.ElementTree as ET
 from reqs.request_xml_service import RequestXmlService
@@ -458,7 +455,7 @@ def get_objects(params, files, url):
         for file in obj['properties'].get('c1000', []):
             if not main_filename:
                 main_filename = file['fileName']
-            res = requests.get(f'https://gql.ivazh.ru/item/{file["key"]}')
+            res = requests.get( Config.gql_download.format(key=file["key"]))
             zipf.writestr(f'{main_filename}/{file["fileName"]}', res.content)
     zipf.close()
     response_files = [{'name': filename, 'url': filepath, 'size': os.path.getsize(filepath)}]
diff --git a/reqs/graphql.py b/reqs_graphql.py
similarity index 92%
rename from reqs/graphql.py
rename to reqs_graphql.py
index 4005463..5ef4bfb 100644
--- a/reqs/graphql.py
+++ b/reqs_graphql.py
@@ -1,8 +1,9 @@
 from gql import gql, Client
 from gql.transport.aiohttp import AIOHTTPTransport
+from config import Config
 
-transport = AIOHTTPTransport(url="https://gql.ivazh.ru/graphql/")
-service = 'pdim'
+transport = AIOHTTPTransport(url=Config.gql_url)
+service = Config.gql_schema
 
 
 def get_classifier():