Update config

This commit is contained in:
Ivan Vazhenin
2024-02-05 20:25:45 +03:00
parent b223733b72
commit 966200132f
3 changed files with 9 additions and 7 deletions

View File

@@ -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'

View File

@@ -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)}]

View File

@@ -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():